Index: branches/2018Q1/Mk/bsd.ccache.mk
===================================================================
--- branches/2018Q1/Mk/bsd.ccache.mk	(revision 462894)
+++ branches/2018Q1/Mk/bsd.ccache.mk	(revision 462895)
@@ -1,56 +1,63 @@
 # $FreeBSD$
 #-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # WITH_CCACHE_BUILD=yes enables depending on ccache and using it in the build.
 # NO_CCACHE_DEPEND will additionally not add the dependency on ccache.
 # NO_CCACHE will disable this entirely.
 
 COMMANDS_Include_MAINTAINER=	portmgr@FreeBSD.org
 
 .if !defined(_CCACHEMKINCLUDED)
 
 _CCACHEMKINCLUDED=	yes
 
 # 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
 NO_CCACHE=	yes
 WARNING+=	WITH_CCACHE_BUILD support disabled, please set CCACHE_DIR.
 .  endif
 .endif
 
 # Support NO_CCACHE for common setups, require WITH_CCACHE_BUILD, and
 # don't use if ccache already set in CC
 .if !defined(NO_CCACHE) && defined(WITH_CCACHE_BUILD) && !${CC:M*ccache*} && \
   !defined(NO_BUILD) && !defined(NOCCACHE)
 
 # Avoid depends loops between ccache and pkg
 .	if !defined(NO_CCACHE_DEPEND) && \
     ${PKGORIGIN} != ${PKG_ORIGIN}
 BUILD_DEPENDS+=		${LOCALBASE}/bin/ccache:devel/ccache
 .	endif
 
 CCACHE_WRAPPER_PATH?=	${LOCALBASE}/libexec/ccache
 
 .if exists(${CCACHE_WRAPPER_PATH})
 # Prepend the ccache dir into the PATH and setup ccache env
 PATH:=	${CCACHE_WRAPPER_PATH}:${PATH}
 #.MAKEFLAGS:		PATH=${PATH}
 .if !${MAKE_ENV:MPATH=*} && !${CONFIGURE_ENV:MPATH=*}
 MAKE_ENV+=			PATH=${PATH}
 CONFIGURE_ENV+=		PATH=${PATH}
 .endif
 
 # Ensure this is always in subchild environments
 .	if defined(CCACHE_DIR)
 #.MAKEFLAGS:		CCACHE_DIR=${CCACHE_DIR}
 MAKE_ENV+=		CCACHE_DIR="${CCACHE_DIR}"
 CONFIGURE_ENV+=	CCACHE_DIR="${CCACHE_DIR}"
 .	endif
 .endif
+
+# Some ports will truncate CCACHE_DIR from the env and due to HOME=${WRKDIR}
+# will incorrectly use ${WRKDIR}/.ccache.  Symlink to the proper place.
+${WRKDIR}/.ccache: ${WRKDIR}
+	@${LN} -sf ${CCACHE_DIR} ${WRKDIR}/.ccache
+ccache-wrkdir-link: ${WRKDIR}/.ccache .PHONY
+post-extract: ccache-wrkdir-link
 .endif
 
 .endif
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 462894)
+++ branches/2018Q1	(revision 462895)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r462894