summaryrefslogtreecommitdiffstats
path: root/share/mk
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-12-08 20:20:40 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-12-08 20:20:40 +0000
commit46f91637f062edde183dc8bdb88b69cc66024259 (patch)
tree4b790481bd261a92e9a257d796f886e2fc917327 /share/mk
parent31f4e32faa6c52d0b94530e781b187b1e4be2d43 (diff)
downloadFreeBSD-src-46f91637f062edde183dc8bdb88b69cc66024259.zip
FreeBSD-src-46f91637f062edde183dc8bdb88b69cc66024259.tar.gz
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
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/bsd.compiler.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
index e5d349a..d7763e4 100644
--- a/share/mk/bsd.compiler.mk
+++ b/share/mk/bsd.compiler.mk
@@ -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}} == ""
OpenPOWER on IntegriCloud