summaryrefslogtreecommitdiffstats
path: root/core/clang
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-04-30 23:35:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-30 23:35:46 +0000
commit93dc05782675f66342f764355e1df1e959f21939 (patch)
tree1392a35ebc25d696f9d327bf695661e27ee74006 /core/clang
parente5381d074f04abc89d72fe18e1284b1506289d30 (diff)
parentcf53e0e0aaf569d7e76472e2958dca5a44f45df2 (diff)
downloadbuild-93dc05782675f66342f764355e1df1e959f21939.zip
build-93dc05782675f66342f764355e1df1e959f21939.tar.gz
build-93dc05782675f66342f764355e1df1e959f21939.tar.bz2
am cf53e0e0: am 27fe9406: am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit 'cf53e0e0aaf569d7e76472e2958dca5a44f45df2': Remove tblgen and clang-tblgen from prebuilts.
Diffstat (limited to 'core/clang')
-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 af7c249..7498ee3 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