diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-03-22 19:41:44 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-03-22 19:41:44 +0000 |
| commit | 6faf9b65ab0e0621394262181c71c5db839b61e6 (patch) | |
| tree | 3a867ad213452b424a0b5940996b429c196ac009 /Mk/bsd.ccache.mk | |
| parent | ea52a4dba6ba605051860199d04d1e73e2f18ab7 (diff) | |
| download | ports-6faf9b65ab0e0621394262181c71c5db839b61e6.tar.gz ports-6faf9b65ab0e0621394262181c71c5db839b61e6.zip | |
Unbreak ccache after r359201 set HOME in MAKE_ENV/CONFIGURE_ENV rather than
in the global scope as bsd.ccache.mk expected.
This was causing ccache to use WKRDIR/.ccache for obj caching. 'make clean'
would then lose all cached files. This worked in in Poudriere though as
CCACHE_DIR is explicitly defined.
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=381950
Diffstat (limited to 'Mk/bsd.ccache.mk')
| -rw-r--r-- | Mk/bsd.ccache.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Mk/bsd.ccache.mk b/Mk/bsd.ccache.mk index 44ab12e347d3..b785c52d66e3 100644 --- a/Mk/bsd.ccache.mk +++ b/Mk/bsd.ccache.mk @@ -6,10 +6,8 @@ COMMANDS_Include_MAINTAINER= portmgr@FreeBSD.org _CCACHEMKINCLUDED= yes -# Try to set a default CCACHE_DIR to workaround HOME=/dev/null and -# HOME=${WRKDIR}/* staging fixes -.if defined(WITH_CCACHE_BUILD) && !defined(CCACHE_DIR) && \ - (!defined(HOME) || ${HOME} == /dev/null || ${HOME:S/^${WRKDIR}//} != ${HOME}) +# HOME is always set to ${WRKDIR} now. Try to use /root/.ccache as default. +.if defined(WITH_CCACHE_BUILD) && !defined(CCACHE_DIR) . if defined(USER) && ${USER} == root CCACHE_DIR= /root/.ccache . else |