StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Drop CLANG and CLANG_CXX in the environment" am: 27a55cd3c7

Browse Source 
am: f03398b651

* commit 'f03398b6519e1d9695c61da450346d5a0f0f8528':
  Drop CLANG and CLANG_CXX in the environment

Change-Id: I9fce3d3c203b89295529c72de4d094ff62d178fd
This commit is contained in:
Dan Willemsen
2016-06-06 21:33:07 +00:00
committed by android-build-merger
parent 31e3dab7bb f03398b651
commit ecf97649bd
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/clang/config.mk
View File

@@ -3,6 +3,12 @@
LLVM_PREBUILTS_PATH := $(LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin
LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib64/clang/$(LLVM_RELEASE_VERSION)/lib/linux/
# These will come from Soong, drop the environment versions
unexport CLANG
unexport CLANG_CXX
unexport CCC_CC
unexport CCC_CXX
CLANG_TBLGEN := $(BUILD_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX)
LLVM_TBLGEN := $(BUILD_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX)