[include] fix up scons vs ccache
authorJohn Crispin <john@openwrt.org>
Sat, 28 Jul 2012 21:06:59 +0000 (21:06 +0000)
committerJohn Crispin <john@openwrt.org>
Sat, 28 Jul 2012 21:06:59 +0000 (21:06 +0000)
SVN-Revision: 32902

include/scons.mk
rules.mk

index 5062681..a8306b6 100644 (file)
@@ -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)" \
index 412615c..114b16c 100644 (file)
--- 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)