svn commit: r381950 - head/Mk

[Bryan Drewery]

Author: bdrewery
Date: Sun Mar 22 19:41:44 2015
New Revision: 381950
URL: https://svnweb.freebsd.org/changeset/ports/381950
QAT: https://qat.redports.org/buildarchive/r381950/

Log:
  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

Modified:
  head/Mk/bsd.ccache.mk

Modified: head/Mk/bsd.ccache.mk
==============================================================================
--- head/Mk/bsd.ccache.mk	Sun Mar 22 19:33:08 2015	(r381949)
+++ head/Mk/bsd.ccache.mk	Sun Mar 22 19:41:44 2015	(r381950)
@@ -6,10 +6,8 @@ COMMANDS_Include_MAINTAINER=	portmgr at Fre
 
 _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