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

* commit '642c81ea4559836236a38123feec3d8e51d4b9c2':
  Stash original values of CC and CXX.
This commit is contained in:
Dan Albert
2014-10-06 18:36:43 +00:00
committed by Android Git Automerger

View File

@@ -106,6 +106,11 @@ ifneq ($(USE_CCACHE),)
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.
ifdef CC_WRAPPER
ifneq ($(CC_WRAPPER),$(firstword $($(combo_var_prefix)CC)))