Date: Tue, 1 Mar 2016 22:25:54 +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: r296282 - head/share/mk Message-ID: <201603012225.u21MPsbW047468@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Mar 1 22:25:54 2016 New Revision: 296282 URL: https://svnweb.freebsd.org/changeset/base/296282 Log: CCACHE_BUILD+META_MODE: Lookup and canonicalize the default CCACHE_DIR. This is done to prevent not having CCACHE_DIR causing meta mode with filemon to see stat changes in the ccache dir and cause rebuilds. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/bsd.compiler.mk Modified: head/share/mk/bsd.compiler.mk ============================================================================== --- head/share/mk/bsd.compiler.mk Tue Mar 1 22:25:49 2016 (r296281) +++ head/share/mk/bsd.compiler.mk Tue Mar 1 22:25:54 2016 (r296282) @@ -83,7 +83,11 @@ CCACHE_NOCPP2= 1 .export CCACHE_NOCPP2 .endif # Canonicalize CCACHE_DIR for meta mode usage. -.if defined(CCACHE_DIR) && empty(.MAKE.META.IGNORE_PATHS:M${CCACHE_DIR}) +.if !defined(CCACHE_DIR) +CCACHE_DIR!= ${CCACHE_BIN} -p | awk '$$2 == "cache_dir" {print $$4}' +.export CCACHE_DIR +.endif +.if !empty(CCACHE_DIR) && empty(.MAKE.META.IGNORE_PATHS:M${CCACHE_DIR}) CCACHE_DIR:= ${CCACHE_DIR:tA} .MAKE.META.IGNORE_PATHS+= ${CCACHE_DIR} .export CCACHE_DIR
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603012225.u21MPsbW047468>