Replace ocamlc tests with ocamlopt tests since they're less noisy.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 5faa6e2e2714eb6f37dedf678534a0e182483225..b8d4367e72be2bca3a8b497673eb7823179d8a33 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ include $(LEVEL)/Makefile.config
 # FIXME: Remove runtime entirely once we have an understanding of where
 # libprofile etc should go.
 #ifeq ($(LLVMGCC_MAJVERS),4)
-  DIRS := $(filter-out runtime, $(DIRS))
+#  DIRS := $(filter-out runtime, $(DIRS))
 #endif
 
 ifeq ($(MAKECMDGOALS),libs-only)
@@ -56,7 +56,7 @@ endif
 
 ifeq ($(MAKECMDGOALS),install-clang)
   DIRS := tools/clang/tools/driver tools/clang/tools/clang-cc \
-       tools/clang/lib/Headers tools/clang/tools/ccc
+       tools/clang/lib/Headers tools/clang/docs
   OPTIONAL_DIRS :=
   NO_INSTALL = 1
 endif
@@ -71,10 +71,9 @@ ifeq ($(MAKECMDGOALS),unittests)
   OPTIONAL_DIRS :=
 endif
 
-# Don't install utils, examples, or projects they are only used to
-# build LLVM.
+# Use NO_INSTALL define of the Makefile of each directory for deciding
+# if the directory is installed or not
 ifeq ($(MAKECMDGOALS),install)
-  DIRS := $(filter-out utils, $(DIRS))
   OPTIONAL_DIRS := $(filter bindings, $(OPTIONAL_DIRS))
 endif
 
@@ -89,10 +88,19 @@ cross-compile-build-tools:
        $(Verb) if [ ! -f BuildTools/Makefile ]; then \
           $(MKDIR) BuildTools; \
          cd BuildTools ; \
-         $(PROJ_SRC_DIR)/configure ; \
+         $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
+               --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE); \
          cd .. ; \
        fi; \
-        ($(MAKE) -C BuildTools BUILD_DIRS_ONLY=1 ) || exit 1;
+        ($(MAKE) -C BuildTools \
+         BUILD_DIRS_ONLY=1 \
+         UNIVERSAL= \
+         ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
+         ENABLE_PROFILING=$(ENABLE_PROFILING) \
+         ENABLE_COVERAGE=$(ENABLE_COVERAGE) \
+         DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \
+         ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \
+       ) || exit 1;
 endif
 
 # Include the main makefile machinery.
@@ -118,7 +126,6 @@ debug-opt-prof:
 dist-hook::
        $(Echo) Eliminating files constructed by configure
        $(Verb) $(RM) -f \
-         $(TopDistDir)/include/llvm/ADT/iterator.h  \
          $(TopDistDir)/include/llvm/Config/config.h  \
          $(TopDistDir)/include/llvm/Support/DataTypes.h  \
          $(TopDistDir)/include/llvm/Support/ThreadSupport.h
@@ -135,8 +142,9 @@ install-libs: install
 #------------------------------------------------------------------------
 FilesToConfig := \
   include/llvm/Config/config.h \
-  include/llvm/Support/DataTypes.h \
-  include/llvm/ADT/iterator.h
+  include/llvm/Config/Targets.def \
+       include/llvm/Config/AsmPrinters.def \
+  include/llvm/Support/DataTypes.h
 FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
 
 all-local:: $(FilesToConfigPATH)
@@ -187,7 +195,7 @@ SVN = svn
 SVN-UPDATE-OPTIONS =
 AWK = awk
 SUB-SVN-DIRS = $(AWK) '/\?\ \ \ \ \ \ / {print $$2}'   \
-               | LANG=C xargs $(SVN) info 2>/dev/null \
+               | LC_ALL=C xargs $(SVN) info 2>/dev/null \
                | $(AWK) '/Path:\ / {print $$2}'
 
 update: