From: John Crispin <blogic@openwrt.org>
Date: Sat, 28 Jul 2012 21:06:59 +0000 (+0000)
Subject: [include] fix up scons vs ccache
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=7c4db9ed3837843a989f0040fe62e80246501b77;p=15.05%2Fopenwrt.git

[include] fix up scons vs ccache

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32902 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/scons.mk b/include/scons.mk
index 5062681d63..a8306b658e 100644
--- a/include/scons.mk
+++ b/include/scons.mk
@@ -1,8 +1,8 @@
 export PLATFORM=posix
 
 SCONS_VARS = \
-	CC="$(TARGET_CC)" \
-	CXX="$(TARGET_CXX)" \
+	CC="$(TARGET_CC_NOCACHE)" \
+	CXX="$(TARGET_CXX_NOCACHE)" \
 	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
 	CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
diff --git a/rules.mk b/rules.mk
index 412615c320..114b16ce3a 100644
--- a/rules.mk
+++ b/rules.mk
@@ -185,13 +185,14 @@ INSTALL_DIR:=install -d -m0755
 INSTALL_DATA:=install -m0644
 INSTALL_CONF:=install -m0600
 
+TARGET_CC_NOCACHE:=$(TARGET_CC)
+TARGET_CXX_NOCACHE:=$(TARGET_CXX)
+HOSTCC_NOCACHE:=$(HOSTCC)
+export TARGET_CC_NOCACHE
+export TARGET_CXX_NOCACHE
+export HOSTCC_NOCACHE
+
 ifneq ($(CONFIG_CCACHE),)
-  TARGET_CC_NOCACHE:=$(TARGET_CC)
-  TARGET_CXX_NOCACHE:=$(TARGET_CXX)
-  HOSTCC_NOCACHE:=$(HOSTCC)
-  export TARGET_CC_NOCACHE
-  export TARGET_CXX_NOCACHE
-  export HOSTCC_NOCACHE
   TARGET_CC:= ccache_cc
   TARGET_CXX:= ccache_cxx
   HOSTCC:= ccache $(HOSTCC)