summaryrefslogtreecommitdiff
path: root/Mk/Uses/compiler.mk
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2020-03-13 16:41:54 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2020-03-13 16:41:54 +0000
commit4cbea9f8d499707054452f3fb48fb889955f05f7 (patch)
treedee117c62c75d514bdabbd586ccb31b95dc103bd /Mk/Uses/compiler.mk
parentmisc/cheat: Update 3.6.0 -> 3.7.1 (diff)
Support compiler version >= 10.
PR: 244781 Approved by: portmgr (antoine)
Notes
Notes: svn path=/head/; revision=528363
Diffstat (limited to 'Mk/Uses/compiler.mk')
-rw-r--r--Mk/Uses/compiler.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk
index cbc2d4699daf..f81d1e3d2ae7 100644
--- a/Mk/Uses/compiler.mk
+++ b/Mk/Uses/compiler.mk
@@ -79,7 +79,7 @@ _CCVERSION!= ${CC} --version
_CCVERSION_${_CC_hash}= ${_CCVERSION}
PORTS_ENV_VARS+= _CCVERSION_${_CC_hash}
.endif
-COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g}
+COMPILER_VERSION= ${_CCVERSION:M[0-9]*.[0-9]*:tW:C/([0-9]+)\.([0-9])\.*/\1\2/g}
.if ${_CCVERSION:Mclang}
COMPILER_TYPE= clang
.else
@@ -103,7 +103,7 @@ _ALTCCVERSION_${_CC_hash}= ${_ALTCCVERSION}
PORTS_ENV_VARS+= _ALTCCVERSION_${_CC_hash}
.endif
-ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g}
+ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9]*.[0-9]*:tW:C/([0-9]+)\.([0-9])\.*/\1\2/g}
.if ${_ALTCCVERSION:Mclang}
ALT_COMPILER_TYPE= clang
.elif ${_ALTCCVERSION} != none