Skip to content

Commit 9bfe296

Browse files
committed
auto merge of #6836 : pnkfelix/rust/fsk-issue6805-ccache-rewrite-basedir, r=catamorphism
Attempt to get reuse of common object code from multiple clones in different directories. This is a followup to issue #6805.
2 parents 784a849 + 7f410b3 commit 9bfe296

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

configure

+7
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,13 @@ then
970970
putvar CFG_CCACHE_CPP2
971971
fi
972972

973+
if [ ! -z "$CFG_ENABLE_CCACHE" ]
974+
then
975+
CFG_CCACHE_BASEDIR=${CFG_SRC_DIR}
976+
putvar CFG_CCACHE_BASEDIR
977+
fi
978+
979+
973980
if [ ! -z $BAD_PANDOC ]
974981
then
975982
CFG_PANDOC=

mk/platform.mk

+5
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,11 @@ ifeq ($(CFG_CCACHE_CPP2),1)
396396
export CCACHE_CPP
397397
endif
398398

399+
ifdef CFG_CCACHE_BASEDIR
400+
CCACHE_BASEDIR=$(CFG_CCACHE_BASEDIR)
401+
export CCACHE_BASEDIR
402+
endif
403+
399404
define CFG_MAKE_TOOLCHAIN
400405
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
401406
$$(CFG_GCCISH_CFLAGS) \

0 commit comments

Comments
 (0)