diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2020-03-13 19:50:39 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2020-03-13 19:50:39 +0000 |
| commit | 056c5054ac667c2e1e7415eb7ccb196778d646c6 (patch) | |
| tree | f3995d986e54e5376bf2078d571168d1145feed6 /Mk | |
| parent | math/mlpack: Update 3.0.1 -> 3.2.2 (diff) | |
Revert r528363, it's broken for llvm < 10
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=528374
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 f81d1e3d2ae7..cbc2d4699daf 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 diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk index 09f520f9a23f..5583e9861cf0 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]*:tW:C/([0-9]).([0-9]).*/\1\2/g} .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]*:tW:C/([0-9]).([0-9]).*/\1\2/g} .if ${_ALTCCVERSION:Mclang} ALT_COMPILER_TYPE= clang .elif !empty(_ALTCCVERSION) |