When cross-building, the CFLAGS and CXXFLAGS are for the target, and don't

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 001d2ad1895e3c10fd1548fb8470ff30d91facf9..671f92c77e87d3c1b2bcc9b95a2bee28fdb2344b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ LEVEL := .
 # "llvmCore", then this is an "Apple-style" build; search for
 # "Apple-style" in the comments for more info.  Anything else is a
 # normal build.
-ifneq ($(RC_ProjectName),llvmCore)  # Normal build (not "Apple-style").
+ifneq ($(findstring llvmCore, $(RC_ProjectName)),llvmCore)  # Normal build (not "Apple-style").
+
 ifeq ($(BUILD_DIRS_ONLY),1)
   DIRS := lib/System lib/Support utils
   OPTIONAL_DIRS :=
@@ -94,6 +95,8 @@ cross-compile-build-tools:
        $(Verb) if [ ! -f BuildTools/Makefile ]; then \
           $(MKDIR) BuildTools; \
          cd BuildTools ; \
+         unset CFLAGS ; \
+         unset CXXFLAGS ; \
          $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
                --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE); \
          cd .. ; \