Attachment 212390 Details for Bug 244781 – Allow compiler major version > 9

[patch] Allow compiler major version > 9

compiler.diff (text/plain), 1.77 KB, created by Jung-uk Kim on 2020-03-13 21:29:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2020-03-13 21:29:16 UTC

Size: 1.77 KB

patch

obsolete

>Index: Mk/Uses/compiler.mk
>===================================================================
>--- Mk/Uses/compiler.mk	(revision 528377)
>+++ Mk/Uses/compiler.mk	(working copy)
>@@ -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
>Index: Mk/Uses/objc.mk
>===================================================================
>--- Mk/Uses/objc.mk	(revision 528377)
>+++ Mk/Uses/objc.mk	(working copy)
>@@ -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)

Actions: View | Diff

Attachments on bug 244781: 212373 | 212385 | 212390