Suggest llvm_unreachable over assert(0).

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 590fab1222c61620f1e514cab16f8fde05db5a78..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
@@ -102,11 +105,6 @@ endif
 ifeq ($(LLVM_CROSS_COMPILING),1)
 all:: cross-compile-build-tools
 
-install:: $(DESTDIR)$(PROJ_bindir)
-       $(Echo) Installing llvm-config-host
-       $(Verb) $(ProgInstall) $(BuildLLVMToolDir)/llvm-config \
-         $(DESTDIR)$(PROJ_bindir)/llvm-config-host
-
 clean::
        $(Verb) rm -rf BuildTools
 
@@ -116,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) \
@@ -249,13 +250,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