[Midnightbsd-cvs] mports [21791] trunk/Mk/extensions/compiler.mk: support either fmake or bmake
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 20 23:29:29 EDT 2016
Revision: 21791
http://svnweb.midnightbsd.org/mports/?rev=21791
Author: laffer1
Date: 2016-08-20 23:29:29 -0400 (Sat, 20 Aug 2016)
Log Message:
-----------
support either fmake or bmake
Modified Paths:
--------------
trunk/Mk/extensions/compiler.mk
Modified: trunk/Mk/extensions/compiler.mk
===================================================================
--- trunk/Mk/extensions/compiler.mk 2016-08-21 03:24:44 UTC (rev 21790)
+++ trunk/Mk/extensions/compiler.mk 2016-08-21 03:29:29 UTC (rev 21791)
@@ -65,7 +65,11 @@
.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
@@ -81,7 +85,11 @@
_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)
More information about the Midnightbsd-cvs
mailing list