mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00
Code Issues Releases Activity

Unbreak ccache after r359201 set HOME in MAKE_ENV/CONFIGURE_ENV rather than

Browse Source 
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
This commit is contained in:
Bryan Drewery 2015-03-22 19:41:44 +00:00
parent ea52a4dba6
commit 6faf9b65ab
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=381950
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mk/bsd.ccache.mk
View File

@ -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