Handle newer cases for freebsd which is approaching 10.0 and not 1.0.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 2a36a7a26eec173707d03ae5d0c27aece4674c6f..754b18e06afd39e7b35098cc7fd358fce2bec7b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ ifneq ($(findstring llvmCore, $(RC_ProjectName)),llvmCore)  # Normal build (not
 
 ifeq ($(BUILD_DIRS_ONLY),1)
   DIRS := lib/Support lib/TableGen utils
-  OPTIONAL_DIRS :=
+  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
@@ -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; \
@@ -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)