aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaƫl Moll <ralf@android.com>2014-05-02 22:09:18 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-05-02 22:09:18 +0000
commit8abfaf6731da88ad045205e612c56123c80dd4a4 (patch)
treeee1f8fd06ec0da40a9118a2294634d29c7ea4bfd
parent660449456e89e6e0f5952cb7029bc01e060ab944 (diff)
parent4c8daa46b08391f17d0954daba94b7aafcdf8c42 (diff)
downloadbuild-8abfaf6731da88ad045205e612c56123c80dd4a4.tar.gz
Merge "Remove tblgen and clang-tblgen from prebuilts." into idea133
-rw-r--r--core/clang/config.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk
index a79a558e34..b8f76f24f7 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -11,10 +11,11 @@ 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)
-TBLGEN := $(LLVM_PREBUILTS_PATH)/tblgen$(BUILD_EXECUTABLE_SUFFIX)
+
+CLANG_TBLGEN := $(HOST_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX)
+TBLGEN := $(HOST_OUT_EXECUTABLES)/tblgen$(BUILD_EXECUTABLE_SUFFIX)
# Clang flags for all host or target rules