Skip to content

Commit 94bf4bf

Browse files
committed
Adapt to work with rtools.
1 parent 8defb3f commit 94bf4bf

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/tbb/build/common_rules.inc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,12 @@ LINK_FILES+=$(TEST_LIBS)
110110
cpp <$< | grep -v '^#' >$*.tmp
111111
$(ASM) $(ASM_FLAGS) -o $@ $*.tmp
112112

113+
ifdef rtools
114+
# Line 70 doesn't work with rtool's version of make. The symptom being that the asm rule kicks off instead, and these rules are cl only
115+
%.$(OBJ): %.cpp
116+
$(CPLUS) $(OUTPUTOBJ_KEY)$@ $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
117+
endif
118+
113119
# Rule for generating .E file if needed for visual inspection
114120
# Note that ICL treats an argument after PREPROC_ONLY as a file to open,
115121
# so all uses of PREPROC_ONLY should be immediately followed by a file name

0 commit comments

Comments
 (0)