Skip to content

Commit

Permalink
auto merge of #6836 : pnkfelix/rust/fsk-issue6805-ccache-rewrite-base…
Browse files Browse the repository at this point in the history
…dir, r=catamorphism

Attempt to get reuse of common object code from multiple clones in different directories.

This is a followup to issue #6805.
  • Loading branch information
bors committed May 30, 2013
2 parents 784a849 + 7f410b3 commit 9bfe296
Showing 2 changed files with 12 additions and 0 deletions.
7 changes: 7 additions & 0 deletions configure
Original file line number Diff line number Diff line change
@@ -970,6 +970,13 @@ then
putvar CFG_CCACHE_CPP2
fi

if [ ! -z "$CFG_ENABLE_CCACHE" ]
then
CFG_CCACHE_BASEDIR=${CFG_SRC_DIR}
putvar CFG_CCACHE_BASEDIR
fi


if [ ! -z $BAD_PANDOC ]
then
CFG_PANDOC=
5 changes: 5 additions & 0 deletions mk/platform.mk
Original file line number Diff line number Diff line change
@@ -396,6 +396,11 @@ ifeq ($(CFG_CCACHE_CPP2),1)
export CCACHE_CPP
endif

ifdef CFG_CCACHE_BASEDIR
CCACHE_BASEDIR=$(CFG_CCACHE_BASEDIR)
export CCACHE_BASEDIR
endif

define CFG_MAKE_TOOLCHAIN
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
$$(CFG_GCCISH_CFLAGS) \

0 comments on commit 9bfe296

Please sign in to comment.