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

am a3b31d7b: am 642c81ea: Merge "Stash original values of CC and CXX."

Browse Source 
* commit 'a3b31d7b83254a644efd12de3de835594124ef65':
  Stash original values of CC and CXX.
This commit is contained in:
Dan Albert
2014-10-06 19:28:48 +00:00
committed by Android Git Automerger
parent 0c68be8c42 a3b31d7b83
commit ddbf420dae
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/combo/select.mk
View File

@@ -106,6 +106,11 @@ ifneq ($(USE_CCACHE),)
endif endif
endif endif
# Stash the original values of CC and CXX so we can still use the non-wrapped
# values later.
$(combo_2nd_arch_prefix)CC_BARE := $($(combo_var_prefix)CC)
$(combo_2nd_arch_prefix)CXX_BARE := $($(combo_var_prefix)CXX)
# The C/C++ compiler can be wrapped by setting the CC/CXX_WRAPPER vars. # The C/C++ compiler can be wrapped by setting the CC/CXX_WRAPPER vars.
ifdef CC_WRAPPER ifdef CC_WRAPPER
ifneq ($(CC_WRAPPER),$(firstword $($(combo_var_prefix)CC))) ifneq ($(CC_WRAPPER),$(firstword $($(combo_var_prefix)CC)))