Make use of common-symbol alignment info in ELF loader.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 604696a1df432d313b664357294ab236c47051fb..2b7838030589e66741fdef5c13fb2a00dc83bfcc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -68,10 +68,13 @@ 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/include/clang-c \
           tools/clang/runtime tools/clang/docs \
           tools/lto runtime
+  ifneq ($(BUILD_CLANG_ONLY),YES)
+    DIRS += tools/clang/tools/c-index-test
+  endif
   OPTIONAL_DIRS :=
   NO_INSTALL = 1
 endif
@@ -111,15 +114,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) \