Author: bdrewery
Date: Wed Jun 27 16:58:03 2018
New Revision: 335709
URL: https://svnweb.freebsd.org/changeset/base/335709
Log:
CCACHE_BUILD: Avoid ccache when looking up compiler metadata.
MFC after: 2 weeks
Sponsored by: Dell EMC
Modified:
head/share/mk/bsd.compiler.mk
Modified: head/share/mk/bsd.compiler.mk
==============================================================================
--- head/share/mk/bsd.compiler.mk Wed Jun 27 16:57:59 2018
(r335708)
+++ head/share/mk/bsd.compiler.mk Wed Jun 27 16:58:03 2018
(r335709)
@@ -148,7 +148,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*}
@@ -171,7 +171,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.
_______________________________________________
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"
