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.
This commit is contained in:
commit
9bfe296eb7
|
@ -970,6 +970,13 @@ then
|
||||||
putvar CFG_CCACHE_CPP2
|
putvar CFG_CCACHE_CPP2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ! -z "$CFG_ENABLE_CCACHE" ]
|
||||||
|
then
|
||||||
|
CFG_CCACHE_BASEDIR=${CFG_SRC_DIR}
|
||||||
|
putvar CFG_CCACHE_BASEDIR
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ ! -z $BAD_PANDOC ]
|
if [ ! -z $BAD_PANDOC ]
|
||||||
then
|
then
|
||||||
CFG_PANDOC=
|
CFG_PANDOC=
|
||||||
|
|
|
@ -396,6 +396,11 @@ ifeq ($(CFG_CCACHE_CPP2),1)
|
||||||
export CCACHE_CPP
|
export CCACHE_CPP
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef CFG_CCACHE_BASEDIR
|
||||||
|
CCACHE_BASEDIR=$(CFG_CCACHE_BASEDIR)
|
||||||
|
export CCACHE_BASEDIR
|
||||||
|
endif
|
||||||
|
|
||||||
define CFG_MAKE_TOOLCHAIN
|
define CFG_MAKE_TOOLCHAIN
|
||||||
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
|
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
|
||||||
$$(CFG_GCCISH_CFLAGS) \
|
$$(CFG_GCCISH_CFLAGS) \
|
||||||
|
|
Loading…
Reference in New Issue