diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2020-03-13 21:46:34 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2020-03-13 21:46:34 +0000 |
| commit | 10c04dc03c01d5e8a5df3a4ed433f6f9862316e6 (patch) | |
| tree | d17529ab8974637cea1abdf3d07b5d0c770bf90d /Mk | |
| parent | 9bdd8e871b28eaceacf5999517c13960b0fb6af2 (diff) | |
| download | ports-10c04dc03c01d5e8a5df3a4ed433f6f9862316e6.tar.gz ports-10c04dc03c01d5e8a5df3a4ed433f6f9862316e6.zip | |
Support compiler version >= 10 (again).
PR: 244781
Approved by: portmgr (antoine)
Notes
Notes:
svn path=/head/; revision=528379
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/compiler.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/objc.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index cbc2d4699daf..fc1dbe8cfddf 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]*:[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 diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk index 5583e9861cf0..09995f4a5725 100644 --- a/Mk/Uses/objc.mk +++ b/Mk/Uses/objc.mk @@ -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) |