From 8affa161fee9bb6d62197013c9f79b902d1568d2 Mon Sep 17 00:00:00 2001 From: Lai Wei-Chih Date: Wed, 17 Sep 2014 13:55:08 +0800 Subject: [PATCH] Use new variable LLVM_PREBUILTS_VERSION to simplify path construction. This removes the hard-coded '3.5' in the various paths and makes switching to a new toolchain easier from the command line (m LLVM_PREBUILTS_VERSION=3.6). Change-Id: I46b10eb2fc177a03528de9c7b433f8647f632081 --- core/clang/config.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/clang/config.mk b/core/clang/config.mk index 0b8590b178..3040b5f8de 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)