Date: Fri, 13 Mar 2020 19:50:39 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528374 - head/Mk/Uses Message-ID: <202003131950.02DJodNt029353@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Fri Mar 13 19:50:39 2020 New Revision: 528374 URL: https://svnweb.freebsd.org/changeset/ports/528374 Log: Revert r528363, it's broken for llvm < 10 With hat: portmgr 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 19:37:11 2020 (r528373) +++ head/Mk/Uses/compiler.mk Fri Mar 13 19:50:39 2020 (r528374) @@ -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 Modified: head/Mk/Uses/objc.mk ============================================================================== --- head/Mk/Uses/objc.mk Fri Mar 13 19:37:11 2020 (r528373) +++ head/Mk/Uses/objc.mk Fri Mar 13 19:50:39 2020 (r528374) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003131950.02DJodNt029353>