diff options
author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-28 21:06:59 +0000 |
---|---|---|
committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-28 21:06:59 +0000 |
commit | f12d141fa078278de2da2145b7d83e11af2c9edc (patch) | |
tree | 60f4824aaa03a29ef8020a2a2c83ad8bad82ff86 | |
parent | 12c804da284b9d8e813360d7835bd247fdbe717e (diff) |
[include] fix up scons vs ccache
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32902 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | include/scons.mk | 4 | ||||
-rw-r--r-- | rules.mk | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/scons.mk b/include/scons.mk index 5062681d6..a8306b658 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)" \ @@ -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) |