--- a/Makefile	Mon May 05 03:18:03 2014 +0900
+++ b/Makefile	Thu Sep 25 16:56:18 2014 +0900
@@ -15,7 +15,7 @@
 #   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 @@
   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,11 +112,20 @@
 	  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 \
+	    configure_opts="$$configure_opts --enable-libcpp"; \
+	  fi; \
 	  $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
 		--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
-	        --disable-polly ; \
+	        --disable-polly $$configure_opts; \
 	  cd .. ; \
 	fi; \
 	($(MAKE) -C BuildTools \
@@ -126,6 +135,7 @@
 	  SDKROOT= \
 	  TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \
 	  TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \
+	  TARGET_LIBS="$(LIBS)" \
 	  ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
 	  ENABLE_PROFILING=$(ENABLE_PROFILING) \
 	  ENABLE_COVERAGE=$(ENABLE_COVERAGE) \