Date: Fri, 8 Jan 2016 23:41:25 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405599 - head/Mk/Uses Message-ID: <201601082341.u08NfPBf030485@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Jan 8 23:41:25 2016 New Revision: 405599 URL: https://svnweb.freebsd.org/changeset/ports/405599 Log: Make COMPILER_VERSION more compatible with clang 3.8 trunk. "clang version 3.8.0 (trunk 256945) (based on LLVM 3.8.0svn)" was giving "38 38" was a result. Now duplicates for fmake are trimmed and only the first version found is used for bmake using its :tW. With hat: portmgr In collaboration with: dim Modified: head/Mk/Uses/compiler.mk Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Fri Jan 8 23:22:54 2016 (r405598) +++ head/Mk/Uses/compiler.mk Fri Jan 8 23:41:25 2016 (r405599) @@ -67,7 +67,11 @@ _COMPILER_ARGS+= features .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601082341.u08NfPBf030485>