diff options
| author | Stephen Hines <srhines@google.com> | 2014-09-26 19:53:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 19:53:05 +0000 |
| commit | 03b61bea0d58b3e7d7f77bcbd8fc473c8e933a39 (patch) | |
| tree | 457369fec0c4b6381d2c3a3cadca86517668443c /core/clang/config.mk | |
| parent | ed51a9d21ea6a8fbc757e52e11ae19de76d92928 (diff) | |
| parent | 3041b7d1f4f457082f8de50bba31adb479731d36 (diff) | |
| download | build-03b61bea0d58b3e7d7f77bcbd8fc473c8e933a39.zip build-03b61bea0d58b3e7d7f77bcbd8fc473c8e933a39.tar.gz build-03b61bea0d58b3e7d7f77bcbd8fc473c8e933a39.tar.bz2 | |
am 3041b7d1: am 3cf20570: Merge "Use new variable LLVM_PREBUILTS_VERSION to simplify path construction."
* commit '3041b7d1f4f457082f8de50bba31adb479731d36':
Use new variable LLVM_PREBUILTS_VERSION to simplify path construction.
Diffstat (limited to 'core/clang/config.mk')
| -rw-r--r-- | core/clang/config.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk index b58d264..c973a16 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -6,8 +6,9 @@ WITHOUT_TARGET_CLANG := true WITHOUT_HOST_CLANG := true endif -LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.5/bin -LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.5/lib/clang/3.5/include/ +LLVM_PREBUILTS_VERSION := 3.5 +LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin +LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/lib/clang/$(LLVM_PREBUILTS_VERSION)/include/ CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX) CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX) |