Re-enable support for --program-prefix.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index ec24862ad6fcefd9b6d0c5edb8ec2e025482bcb0..e59441c4329a56294ad7afccd2d58db0cc95d741 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -111,15 +111,18 @@ cross-compile-build-tools:
          cd BuildTools ; \
          unset CFLAGS ; \
          unset CXXFLAGS ; \
+         unset SDKROOT ; \
+         unset UNIVERSAL_SDK_PATH ; \
          $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
                --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
                --disable-polly ; \
          cd .. ; \
        fi; \
-       (unset SDKROOT; \
-        $(MAKE) -C BuildTools \
+       ($(MAKE) -C BuildTools \
          BUILD_DIRS_ONLY=1 \
          UNIVERSAL= \
+         UNIVERSAL_SDK_PATH= \
+         SDKROOT= \
          TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \
          TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \
          ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
@@ -244,13 +247,13 @@ build-for-llvm-top:
 SVN = svn
 SVN-UPDATE-OPTIONS =
 AWK = awk
-SUB-SVN-DIRS = $(AWK) '/\?\ \ \ \ \ \ / {print $$2}'   \
+SUB-SVN-DIRS = $(AWK) '/I|\?      / {print $$2}'   \
                | LC_ALL=C xargs $(SVN) info 2>/dev/null \
                | $(AWK) '/^Path:\ / {print $$2}'
 
 update:
        $(SVN) $(SVN-UPDATE-OPTIONS) update $(LLVM_SRC_ROOT)
-       @ $(SVN) status $(LLVM_SRC_ROOT) | $(SUB-SVN-DIRS) | xargs $(SVN) $(SVN-UPDATE-OPTIONS) update
+       @ $(SVN) status --no-ignore $(LLVM_SRC_ROOT) | $(SUB-SVN-DIRS) | xargs $(SVN) $(SVN-UPDATE-OPTIONS) update
 
 happiness: update all check-all