commit 9119f14943b3d90863660fec58b4967c9ba2ccaa
author Dan Albert <danalbert@google.com> Mon Nov 16 18:28:24 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 16 18:28:24 2015 +0000
tree 927b7bdbf9427b77c985f75c8990b125f177ee0c
parent 99d5f361b4d587eed1b197f501bff64223dda3b9
parent 8b1d17706f092bc39bd152832c7c1d2faa9cff12

Merge "Allow overriding the LLVM prebuilts path."

core/clang/config.mk

diff --git a/core/clang/config.mk b/core/clang/config.mk
index 03e8dd5..00815e4 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -1,7 +1,8 @@
 ## Clang configurations.
 
 LLVM_PREBUILTS_VERSION := 3.8
-LLVM_PREBUILTS_PATH := prebuilts/clang/host/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin
+LLVM_PREBUILTS_BASE := prebuilts/clang/host
+LLVM_PREBUILTS_PATH := $(LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin
 LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/
 
 CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)