projects
/
openwrt
/
staging
/
noltari.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
101766f
)
fix up scons vs ccache
author
John Crispin
<john@openwrt.org>
Sat, 28 Jul 2012 21:06:59 +0000
(21:06 +0000)
committer
John Crispin
<john@openwrt.org>
Sat, 28 Jul 2012 21:06:59 +0000
(21:06 +0000)
SVN-Revision: 32902
include/scons.mk
patch
|
blob
|
history
rules.mk
patch
|
blob
|
history
diff --git
a/include/scons.mk
b/include/scons.mk
index 5062681d63cc0e0113ea790812c5f9aac2f6a9b7..a8306b658e2026485f080ce520468c23ccf0b38d 100644
(file)
--- a/
include/scons.mk
+++ b/
include/scons.mk
@@
-1,8
+1,8
@@
export PLATFORM=posix
SCONS_VARS = \
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)" \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
diff --git
a/rules.mk
b/rules.mk
index 412615c3203b0224e68ab4239c6e1f6f39b5e5b3..114b16ce3a2d75d8748aefa21d6323d4037a541b 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
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),)
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)
TARGET_CC:= ccache_cc
TARGET_CXX:= ccache_cxx
HOSTCC:= ccache $(HOSTCC)