svn commit: r337475 - stable/11/share/mk
Bryan Drewery
bdrewery at FreeBSD.org
Wed Aug 8 17:59:34 UTC 2018
Author: bdrewery
Date: Wed Aug 8 17:59:33 2018
New Revision: 337475
URL: https://svnweb.freebsd.org/changeset/base/337475
Log:
MFC r335709:
CCACHE_BUILD: Avoid ccache when looking up compiler metadata.
Modified:
stable/11/share/mk/bsd.compiler.mk
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/mk/bsd.compiler.mk
==============================================================================
--- stable/11/share/mk/bsd.compiler.mk Wed Aug 8 17:58:38 2018 (r337474)
+++ stable/11/share/mk/bsd.compiler.mk Wed Aug 8 17:59:33 2018 (r337475)
@@ -138,7 +138,7 @@ ${X_}COMPILER_TYPE= none
${X_}COMPILER_VERSION= 0
${X_}COMPILER_FREEBSD_VERSION= 0
.elif !defined(${X_}COMPILER_TYPE) || !defined(${X_}COMPILER_VERSION)
-_v!= ${${cc}} --version || echo 0.0.0
+_v!= ${${cc}:N${CCACHE_BIN}} --version || echo 0.0.0
.if !defined(${X_}COMPILER_TYPE)
. if ${${cc}:T:M*gcc*}
@@ -161,7 +161,7 @@ ${X_}COMPILER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | aw
.undef _v
.endif
.if !defined(${X_}COMPILER_FREEBSD_VERSION)
-${X_}COMPILER_FREEBSD_VERSION!= { echo "__FreeBSD_cc_version" | ${${cc}} -E - 2>/dev/null || echo __FreeBSD_cc_version; } | sed -n '$$p'
+${X_}COMPILER_FREEBSD_VERSION!= { echo "__FreeBSD_cc_version" | ${${cc}:N${CCACHE_BIN}} -E - 2>/dev/null || echo __FreeBSD_cc_version; } | sed -n '$$p'
# If we get a literal "__FreeBSD_cc_version" back then the compiler
# is a non-FreeBSD build that doesn't support it or some other error
# occurred.
More information about the svn-src-all
mailing list