diff options
| author | John Crispin <john@openwrt.org> | 2012-07-28 21:06:59 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2012-07-28 21:06:59 +0000 |
| commit | 370894e594af0547bf788b509c6ae40507101283 (patch) | |
| tree | 23de9f35394e249e2ae1b2c157ee10cd77cb2cf1 | |
| parent | 101766fb0060f523a45f8500e2047d8e7a9d36f7 (diff) | |
| download | upstream-370894e594af0547bf788b509c6ae40507101283.tar.gz upstream-370894e594af0547bf788b509c6ae40507101283.tar.bz2 upstream-370894e594af0547bf788b509c6ae40507101283.zip | |
fix up scons vs ccache
SVN-Revision: 32902
| -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 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)" \ @@ -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) |