Add OpenCL blurb to release notes.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 754b18e06afd39e7b35098cc7fd358fce2bec7b6..82b16fc60c0f36a95048fd85ada7875fd08e3807 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,11 +27,11 @@ 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-2
   OPTIONAL_DIRS := tools/clang/utils/TableGen
 else
   DIRS := lib/Support lib/TableGen utils lib/VMCore lib tools/llvm-shlib \
-          tools/llvm-config tools runtime docs unittests
+          tools/llvm-config tools/llvm-config-2 tools runtime docs unittests
   OPTIONAL_DIRS := projects bindings
 endif
 
@@ -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;
@@ -209,7 +214,7 @@ ifneq ($(ENABLE_OPTIMIZED),1)
        $(Echo) '*****' configure with --enable-optimized.
 ifeq ($(SHOW_DIAGNOSTICS),1)
        $(Verb) if test -s $(LLVM_OBJ_ROOT)/$(BuildMode)/diags; then \
-         $(LLVM_SRC_ROOT)/utils/show-diagnostics \
+         $(LLVM_SRC_ROOT)/utils/clang-parse-diagnostics-file -a \
            $(LLVM_OBJ_ROOT)/$(BuildMode)/diags; \
        fi
 endif