Introduce line editor library.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index e3672b76b4dd90ee6151cd4dfb31bdabcd927a05..cfca73afc475c398c00e1c336466eaf6673e3a17 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -114,9 +114,13 @@ cross-compile-build-tools:
          unset CXXFLAGS ; \
          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 +130,7 @@ cross-compile-build-tools:
          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) \