Merge decoding of VPERMILPD and VPERMILPS shuffle masks. Merge X86ISD node type for...

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index dae41cf56aa1d4cbe959a38f5509277e3bf6fa88..79fb043a8ccbe65dfa435f8ceeab0350b9c7e024 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ LEVEL := .
 ifneq ($(findstring llvmCore, $(RC_ProjectName)),llvmCore)  # Normal build (not "Apple-style").
 
 ifeq ($(BUILD_DIRS_ONLY),1)
-  DIRS := lib/Support lib/TableGen utils
+  DIRS := lib/Support lib/TableGen utils tools/llvm-config
   OPTIONAL_DIRS := tools/clang/utils/TableGen
 else
   DIRS := lib/Support lib/TableGen utils lib/VMCore lib tools/llvm-shlib \
@@ -68,6 +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/include/clang-c \
           tools/clang/runtime tools/clang/docs \
           tools/lto runtime
   OPTIONAL_DIRS :=
@@ -77,7 +79,7 @@ endif
 ifeq ($(MAKECMDGOALS),install-clang-c)
   DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
           tools/clang/tools/libclang tools/clang/tools/c-index-test \
-         tools/clang/include/clang-c
+         tools/clang/include/clang-c
   OPTIONAL_DIRS :=
   NO_INSTALL = 1
 endif
@@ -126,11 +128,14 @@ cross-compile-build-tools:
         $(MAKE) -C BuildTools \
          BUILD_DIRS_ONLY=1 \
          UNIVERSAL= \
+         TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \
+         TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \
          ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
          ENABLE_PROFILING=$(ENABLE_PROFILING) \
          ENABLE_COVERAGE=$(ENABLE_COVERAGE) \
          DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \
          ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \
+         ENABLE_LIBCPP=$(ENABLE_LIBCPP) \
          CFLAGS= \
          CXXFLAGS= \
        ) || exit 1;