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

am aea1cae4: Merge "Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."""

Browse Source 
* commit 'aea1cae4f5a3fcc5e6ecdca24409f102469b411b':
  Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""
This commit is contained in:
Ying Wang
2014-07-30 16:17:06 +00:00
committed by Android Git Automerger
parent 9929fd661c aea1cae4f5
commit 18c20aae44
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/clang/config.mk
View File

@@ -17,6 +17,17 @@ LLVM_LINK := $(LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX)
CLANG_TBLGEN := $(HOST_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX) CLANG_TBLGEN := $(HOST_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX)
LLVM_TBLGEN := $(HOST_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX) LLVM_TBLGEN := $(HOST_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX)
# The C/C++ compiler can be wrapped by setting the CC/CXX_WRAPPER vars.
ifdef CC_WRAPPER
ifneq ($(CC_WRAPPER),$(firstword $(CLANG)))
CLANG := $(CC_WRAPPER) $(CLANG)
endif
endif
ifdef CXX_WRAPPER
ifneq ($(CXX_WRAPPER),$(firstword $(CLANG_CXX)))
CLANG_CXX := $(CXX_WRAPPER) $(CLANG_CXX)
endif
endif
# Clang flags for all host or target rules # Clang flags for all host or target rules
CLANG_CONFIG_EXTRA_ASFLAGS := CLANG_CONFIG_EXTRA_ASFLAGS :=

4
core/combo/select.mk
View File

@@ -82,6 +82,10 @@ ifneq ($(USE_CCACHE),)
# on a workstation. # on a workstation.
export CCACHE_BASEDIR := / export CCACHE_BASEDIR := /
# Workaround for ccache with clang.
# See http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html
export CCACHE_CPP2 := true
CCACHE_HOST_TAG := $(HOST_PREBUILT_TAG) CCACHE_HOST_TAG := $(HOST_PREBUILT_TAG)
# If we are cross-compiling Windows binaries on Linux # If we are cross-compiling Windows binaries on Linux
# then use the linux ccache binary instead. # then use the linux ccache binary instead.