test commit redux

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 610deba36bb59b08c8d80c8dd49639033c89e15b..dae41cf56aa1d4cbe959a38f5509277e3bf6fa88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
 LEVEL := .
 
 # Top-Level LLVM Build Stages:
-#   1. Build lib/Support, which is used by utils (tblgen).
+#   1. Build lib/Support and lib/TableGen, which are used by utils (tblgen).
 #   2. Build utils, which is used by VMCore.
 #   3. Build VMCore, which builds the Intrinsics.inc file used by libs.
 #   4. Build libs, which are needed by llvm-config.
@@ -27,10 +27,10 @@ LEVEL := .
 ifneq ($(findstring llvmCore, $(RC_ProjectName)),llvmCore)  # Normal build (not "Apple-style").
 
 ifeq ($(BUILD_DIRS_ONLY),1)
-  DIRS := lib/Support utils
-  OPTIONAL_DIRS :=
+  DIRS := lib/Support lib/TableGen utils
+  OPTIONAL_DIRS := tools/clang/utils/TableGen
 else
-  DIRS := lib/Support utils lib/VMCore lib tools/llvm-shlib \
+  DIRS := lib/Support lib/TableGen utils lib/VMCore lib tools/llvm-shlib \
           tools/llvm-config tools runtime docs unittests
   OPTIONAL_DIRS := projects bindings
 endif
@@ -118,7 +118,8 @@ cross-compile-build-tools:
          unset CFLAGS ; \
          unset CXXFLAGS ; \
          $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
-               --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE); \
+               --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
+               --disable-polly ; \
          cd .. ; \
        fi; \
        (unset SDKROOT; \
@@ -208,7 +209,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
@@ -242,7 +243,7 @@ SVN-UPDATE-OPTIONS =
 AWK = awk
 SUB-SVN-DIRS = $(AWK) '/\?\ \ \ \ \ \ / {print $$2}'   \
                | LC_ALL=C xargs $(SVN) info 2>/dev/null \
-               | $(AWK) '/Path:\ / {print $$2}'
+               | $(AWK) '/^Path:\ / {print $$2}'
 
 update:
        $(SVN) $(SVN-UPDATE-OPTIONS) update $(LLVM_SRC_ROOT)