Date: Thu, 14 Jan 2016 18:54:29 +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: r406126 - head/Mk/Uses Message-ID: <201601141854.u0EIsTJc008046@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Thu Jan 14 18:54:29 2016 New Revision: 406126 URL: https://svnweb.freebsd.org/changeset/ports/406126 Log: Extend r405599 to make COMPILER_VERSION and ALT_COMPILER_VERSION more compatible with clang 3.8 trunk PR: 206074 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 Thu Jan 14 17:30:19 2016 (r406125) +++ head/Mk/Uses/compiler.mk Thu Jan 14 18:54:29 2016 (r406126) @@ -89,7 +89,11 @@ _ALTCCVERSION!= /usr/bin/clang --version _ALTCCVERSION!= /usr/bin/gcc --version .endif -ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g} +.if defined(.PARSEDIR) +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g} +.else +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u} +.endif .if ${_ALTCCVERSION:Mclang} ALT_COMPILER_TYPE= clang .elif !empty(_ALTCCVERSION) Modified: head/Mk/Uses/objc.mk ============================================================================== --- head/Mk/Uses/objc.mk Thu Jan 14 17:30:19 2016 (r406125) +++ head/Mk/Uses/objc.mk Thu Jan 14 18:54:29 2016 (r406126) @@ -16,7 +16,11 @@ IGNORE= USES=objc only accepts no argume .endif _CCVERSION!= ${CC} --version -COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g} +.if defined(.PARSEDIR) +COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g} +.else +COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u} +.endif .if ${_CCVERSION:Mclang} COMPILER_TYPE= clang .else @@ -32,7 +36,11 @@ _ALTCCVERSION!= /usr/bin/clang --version _ALTCCVERSION!= /usr/bin/gcc --version .endif -ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g} +.if defined(.PARSEDIR) +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g} +.else +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u} +.endif .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?201601141854.u0EIsTJc008046>