From 8b1d17706f092bc39bd152832c7c1d2faa9cff12 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 13 Nov 2015 23:06:07 -0800 Subject: [PATCH] Allow overriding the LLVM prebuilts path. The automated build will need to do a two stage build, and we want to do that without altering the source directory. Building with `make LLVM_PREBUILTS_BASE=/path/to/prebuilts` will build using an arbitrary toolchain instead of the installed one. Bug: http://b/17441393 Change-Id: I4ff5c5224fbb8ebeb3a752907d6c4cd0a925aa1e --- core/clang/config.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/clang/config.mk b/core/clang/config.mk index 03e8dd5b9f..00815e45ce 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)