autoconf config.* claims to not know about auroraux triple.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index b0045dc8ec840c911e0f9399938bea9336401d83..31c1b6961a3bde87fad01d7554b7f45ad09aae28 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,6 @@ 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)
@@ -33,7 +32,11 @@ ifeq ($(BUILD_DIRS_ONLY),1)
 else
   DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
           tools runtime docs unittests
-  OPTIONAL_DIRS := examples projects bindings
+  OPTIONAL_DIRS := projects bindings
+endif
+
+ifeq ($(BUILD_EXAMPLES),1)
+  OPTIONAL_DIRS += examples
 endif
 
 EXTRA_DIST := test unittests llvm.spec include win32 Xcode
@@ -96,6 +99,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 .. ; \