summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-04-30 21:52:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-30 21:52:33 +0000
commit27fe940676b568bb9a0af889028495fab73853f2 (patch)
treed2eb9b62e204b5fd07c231b1e3c45c3998b4cdb9
parent3f1d1608ebc4a0c307c94b67943bee004d8428a1 (diff)
parent7e65b6c1e53a51db0aa65126f2453f27daa0f22f (diff)
downloadbuild-27fe940676b568bb9a0af889028495fab73853f2.zip
build-27fe940676b568bb9a0af889028495fab73853f2.tar.gz
build-27fe940676b568bb9a0af889028495fab73853f2.tar.bz2
am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '7e65b6c1e53a51db0aa65126f2453f27daa0f22f': Remove tblgen and clang-tblgen from prebuilts.
-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 a79a558..b8f76f2 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