Author: bdrewery
Date: Tue Dec 8 20:20:40 2015
New Revision: 292002
URL: https://svnweb.freebsd.org/changeset/base/292002
Log:
CCACHE_BUILD: Only export CCACHE_PATH= if it was already set with a value.
Older ccache don't work with an empty CCACHE_PATH value. They will error
with:
ccache: FATAL: Could not find compiler "cc" in PATH
make: "/mnt/bdrewery/git/onefs/src/share/mk/bsd.compiler.mk" line 134:
Unable to determine compiler type for /usr/local/bin/ccache cc. Consider
setting COMPILER_TYPE.
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 Dec 8 20:05:27 2015
(r292001)
+++ head/share/mk/bsd.compiler.mk Tue Dec 8 20:20:40 2015
(r292002)
@@ -64,8 +64,10 @@ CCACHE_COMPILERCHECK?= mtime
# Remove ccache from the PATH to prevent double calls and wasted CPP/LD time.
PATH:= ${PATH:C,:?${CCACHE_WRAPPER_PATH}(/world)?(:$)?,,g}
# Ensure no bogus CCACHE_PATH leaks in which might avoid the in-tree compiler.
+.if !empty(CCACHE_PATH)
CCACHE_PATH=
.export CCACHE_PATH
+.endif
# Override various toolchain vars.
.for var in CC CXX HOST_CC HOST_CXX
.if defined(${var}) && ${${var}:M${CCACHE_BIN}} == ""
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
