Date: Wed, 23 Sep 2015 21:46:58 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288155 - head/share/mk Message-ID: <201509232146.t8NLkwxb058111@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Sep 23 21:46:58 2015 New Revision: 288155 URL: https://svnweb.freebsd.org/changeset/base/288155 Log: META_MODE: Follow-up r287865 and define CCACHE_DIR as realpath'd. Filemon(4) will record paths as they are seen, not as fully resolved. make(1) will take the .MAKE.META.IGNORE_PATHS values and resolve them. This creates a discrepancy if CCACHE_DIR is a symlink. Fix this by ensuring it is resolved for its actual usage. Submitted by: sjg Modified: head/share/mk/local.meta.sys.mk Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Wed Sep 23 21:35:58 2015 (r288154) +++ head/share/mk/local.meta.sys.mk Wed Sep 23 21:46:58 2015 (r288155) @@ -193,7 +193,9 @@ UPDATE_DEPENDFILE= NO .MAKE.META.BAILIWICK = ${SB} ${OBJROOT} ${STAGE_ROOT} .if defined(CCACHE_DIR) +CCACHE_DIR := ${CCACHE_DIR:tA} .MAKE.META.IGNORE_PATHS += ${CCACHE_DIR} +.export CCACHE_DIR .endif CSU_DIR.${MACHINE_ARCH} ?= csu/${MACHINE_ARCH}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509232146.t8NLkwxb058111>