diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2014-12-06 04:02:56 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2014-12-06 04:02:56 +0000 |
commit | a8374a76b1f88f9fb60d99ee7f91006195c9b339 (patch) | |
tree | ba7727c75c71b72f2c6578ecb2425e775b1909a9 /share/mk/bsd.compiler.mk | |
parent | 9f1bd9c14604daf3c0c14d3c874d63cb80e449bb (diff) | |
download | src-a8374a76b1f88f9fb60d99ee7f91006195c9b339.tar.gz src-a8374a76b1f88f9fb60d99ee7f91006195c9b339.zip |
${CC} --version doesn't need to be queried if both COMPILER_TYPE and
COMPILER_VERSION are known
Notes
Notes:
svn path=/projects/building-blocks/; revision=275558
Diffstat (limited to 'share/mk/bsd.compiler.mk')
-rw-r--r-- | share/mk/bsd.compiler.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk index e5b2b869d57c..d431c84b3f80 100644 --- a/share/mk/bsd.compiler.mk +++ b/share/mk/bsd.compiler.mk @@ -25,6 +25,7 @@ .if !target(__<bsd.compiler.mk>__) __<bsd.compiler.mk>__: +.if !defined(COMPILER_TYPE) && !defined(COMPILER_VERSION) _v!= ${CC} --version 2>/dev/null || echo 0.0.0 .if !defined(COMPILER_TYPE) . if ${CC:T:M*gcc*} @@ -45,6 +46,7 @@ COMPILER_TYPE:= clang COMPILER_VERSION!=echo ${_v:M[1-9].[0-9]*} | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' .endif .undef _v +.endif .if ${COMPILER_TYPE} == "clang" || \ (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800) |