diff options
| author | Tim Murray <timmurray@google.com> | 2014-04-01 23:24:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-01 23:24:56 +0000 |
| commit | 572e9accc05c467d74d3f4fbf2dbc05b8424e302 (patch) | |
| tree | 327e0febe459452fdf5f53676322633fafb96bb9 | |
| parent | 47e6073979254ef4fbc60554079b2bf19ac32ab1 (diff) | |
| parent | 125a3c9fb00acf81c1bd395519879094d9af5b3a (diff) | |
| download | build-572e9accc05c467d74d3f4fbf2dbc05b8424e302.tar.gz | |
Merge "Always use prebuilt clang, even if we're explicitly building clang/LLVM."
| -rw-r--r-- | core/clang/config.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk index 7a513c667c..c471f7ebbd 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -6,13 +6,8 @@ WITHOUT_TARGET_CLANG := true WITHOUT_HOST_CLANG := true endif -ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS)) -LLVM_PREBUILTS_PATH := $(BUILD_OUT_EXECUTABLES) -LLVM_PREBUILTS_HEADER_PATH := external/clang/lib/include -else LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.4/bin LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.4/lib/clang/3.4/include/ -endif CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX) CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX) |