diff options
| author | Stephen Hines <srhines@google.com> | 2014-04-23 16:57:46 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-04-24 15:53:16 -0700 |
| commit | 36b56886974eae4f9c5ebc96befd3e7bfe5de338 (patch) | |
| tree | e6cfb69fbbd937f450eeb83bfb83b9da3b01275a /Makefile | |
| parent | 69a8640022b04415ae9fac62f8ab090601d8f889 (diff) | |
| download | external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.zip external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.tar.gz external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.tar.bz2 | |
Update to LLVM 3.5a.
Change-Id: Ifadecab779f128e62e430c2b4f6ddd84953ed617
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -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,11 +112,20 @@ 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 \ + 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 @@ 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) \ |