Merging r259228:

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 5cb38d1e3070ef615da083641e895c2b922164bf..2b9468af205381d5b7e25d4dd8873ed560819006 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ LEVEL := .
 #   3. Build IR, which builds the Intrinsics.inc file used by libs.
 #   4. Build libs, which are needed by llvm-config.
 #   5. Build llvm-config, which determines inter-lib dependencies for tools.
-#   6. Build tools and docs.
+#   6. Build tools, docs, and cmake modules.
 #
 # When cross-compiling, there are some things (tablegen) that need to
 # be build for the build system first.
@@ -31,7 +31,7 @@ ifeq ($(BUILD_DIRS_ONLY),1)
   OPTIONAL_DIRS := tools/clang/utils/TableGen
 else
   DIRS := lib/Support lib/TableGen utils lib/IR lib tools/llvm-shlib \
-          tools/llvm-config tools docs unittests
+          tools/llvm-config tools docs cmake unittests
   OPTIONAL_DIRS := projects bindings
 endif
 
@@ -112,10 +112,15 @@ cross-compile-build-tools:
          cd BuildTools ; \
          unset CFLAGS ; \
          unset CXXFLAGS ; \
+         AR=$(BUILD_AR) ; \
+         AS=$(BUILD_AS) ; \
+         LD=$(BUILD_LD) ; \
+         CC=$(BUILD_CC) ; \
+         CXX=$(BUILD_CXX) ; \
          unset SDKROOT ; \
          unset UNIVERSAL_SDK_PATH ; \
          configure_opts= ; \
-         if test "$ENABLE_LIBCPP" -ne 0 ; then \
+         if test "$(ENABLE_LIBCPP)" -ne 0 ; then \
            configure_opts="$$configure_opts --enable-libcpp"; \
          fi; \
          $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \