diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-06 18:33:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-06 18:33:59 +0000 |
| commit | 642c81ea4559836236a38123feec3d8e51d4b9c2 (patch) | |
| tree | 279d863c3772edcd1f01e99940a3542dc09b7f54 | |
| parent | b6361968f86a1e96e1cdf5451d62ea35541de1e3 (diff) | |
| parent | ec1b90f81f3087c8cfc2bdfa34af381576c9aa47 (diff) | |
| download | build-642c81ea4559836236a38123feec3d8e51d4b9c2.tar.gz | |
Merge "Stash original values of CC and CXX."
| -rw-r--r-- | core/combo/select.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/combo/select.mk b/core/combo/select.mk index d495c6ff1d..00c1558a00 100644 --- a/core/combo/select.mk +++ b/core/combo/select.mk @@ -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))) |