From ec1b90f81f3087c8cfc2bdfa34af381576c9aa47 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Sat, 4 Oct 2014 13:51:57 -0700
Subject: [PATCH] Stash original values of CC and CXX.

This way we can still access the real compiler as opposed to a wrapped
one.

Change-Id: I17ba30416a3eb8eda056c67faaa8b5957e70caea
---
 core/combo/select.mk | 5 +++++
 1 file changed, 5 insertions(+)

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)))