svn commit: r528379 - head/Mk/Uses
Jung-uk Kim
jkim at FreeBSD.org
Fri Mar 13 21:46:35 UTC 2020
Author: jkim
Date: Fri Mar 13 21:46:34 2020
New Revision: 528379
URL: https://svnweb.freebsd.org/changeset/ports/528379
Log:
Support compiler version >= 10 (again).
PR: 244781
Approved by: portmgr (antoine)
Modified:
head/Mk/Uses/compiler.mk
head/Mk/Uses/objc.mk
Modified: head/Mk/Uses/compiler.mk
==============================================================================
--- head/Mk/Uses/compiler.mk Fri Mar 13 21:11:06 2020 (r528378)
+++ head/Mk/Uses/compiler.mk Fri Mar 13 21:46:34 2020 (r528379)
@@ -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]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
.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]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
.if ${_ALTCCVERSION:Mclang}
ALT_COMPILER_TYPE= clang
.elif ${_ALTCCVERSION} != none
Modified: head/Mk/Uses/objc.mk
==============================================================================
--- head/Mk/Uses/objc.mk Fri Mar 13 21:11:06 2020 (r528378)
+++ head/Mk/Uses/objc.mk Fri Mar 13 21:46:34 2020 (r528379)
@@ -26,7 +26,7 @@ _CCVERSION!= ${CC} --version
_OBJC_CCVERSION_${_CC_hash}= ${_CCVERSION}
PORTS_ENV_VARS+= _OBJC_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]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
.if ${_CCVERSION:Mclang}
COMPILER_TYPE= clang
.else
@@ -48,7 +48,7 @@ _OBJC_ALTCCVERSION_${_CC_hash}= ${_ALTCCVERSION}
PORTS_ENV_VARS+= _OBJC_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]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
.if ${_ALTCCVERSION:Mclang}
ALT_COMPILER_TYPE= clang
.elif !empty(_ALTCCVERSION)
More information about the svn-ports-all
mailing list