Fix a bug in the code that merges consecutive stores. Previously we did not

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index a935df469c6582cc00d8bd312d122dcaf278afa2..1e5dae470d262a0376990d47f9fc4edceb1b58c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,8 @@ endif
 
 ifeq ($(MAKECMDGOALS),install-clang)
   DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
-          tools/clang/tools/libclang tools/clang/tools/c-index-test \
+          tools/clang/tools/libclang \
+          tools/clang/tools/c-index-test \
           tools/clang/include/clang-c \
           tools/clang/runtime tools/clang/docs \
           tools/lto runtime
@@ -112,15 +113,17 @@ cross-compile-build-tools:
          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) \