diff options
| author | Raphael Moll <ralf@android.com> | 2014-05-19 17:17:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-19 17:17:19 +0000 |
| commit | 39a7bc62083315697d8255d4f40e9d8a537ae9be (patch) | |
| tree | cd708df1caf6a9ea33dd6ddc0491c6c8aa60720d | |
| parent | ad58f1884bb5d19577cb6fe401ad2808451c6250 (diff) | |
| parent | 08c53c8ea71e61332dceb1ce6322869f2e5c5d67 (diff) | |
| download | build-39a7bc62083315697d8255d4f40e9d8a537ae9be.tar.gz | |
Merge "Revert "Remove tblgen and clang-tblgen from prebuilts." DO NOT MERGE." into tools_r22.6
| -rw-r--r-- | core/clang/config.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk index b8f76f24f7..a79a558e34 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -11,11 +11,10 @@ LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.5/lib/clang CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX) CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX) +CLANG_TBLGEN := $(LLVM_PREBUILTS_PATH)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX) LLVM_AS := $(LLVM_PREBUILTS_PATH)/llvm-as$(BUILD_EXECUTABLE_SUFFIX) LLVM_LINK := $(LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX) - -CLANG_TBLGEN := $(HOST_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX) -TBLGEN := $(HOST_OUT_EXECUTABLES)/tblgen$(BUILD_EXECUTABLE_SUFFIX) +TBLGEN := $(LLVM_PREBUILTS_PATH)/tblgen$(BUILD_EXECUTABLE_SUFFIX) # Clang flags for all host or target rules |