add size_t and a version of rfind that allows specification of where

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 5d10f8e237f1ea3448444c16ce10acc75b2f34cb..03ab0446522a55dff64c73aa62b687fb16474cce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ ifeq ($(BUILD_DIRS_ONLY),1)
   OPTIONAL_DIRS :=
 else
   DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
-          tools runtime docs
+          tools runtime docs unittests
   OPTIONAL_DIRS := examples projects bindings
 endif
 
@@ -88,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.