CVS commit: pkgsrc/mk/compiler

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed Sep 18 06:15:13 UTC 2019

Modified Files:
        pkgsrc/mk/compiler: gcc.mk

Log Message:
mk/compiler: replace complicated :M_asdf_ modifier with :[1]

The :[1] modifier has been added to bmake in 2006.


To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 pkgsrc/mk/compiler/gcc.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.204 pkgsrc/mk/compiler/gcc.mk:1.205
--- pkgsrc/mk/compiler/gcc.mk:1.204     Sun Sep  8 09:24:52 2019
+++ pkgsrc/mk/compiler/gcc.mk   Wed Sep 18 06:15:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.204 2019/09/08 09:24:52 rillig Exp $
+# $NetBSD: gcc.mk,v 1.205 2019/09/18 06:15:13 rillig Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -187,14 +187,14 @@ _GCC_AUX_PATTERNS= 20[1-2][0-9][0-1][0-9
 
 # _CC is the full path to the compiler named by ${CC} if it can be found.
 .if !defined(_CC)
-_CC:=  ${CC:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+_CC:=  ${CC:[1]}
 .  if !empty(GCCBASE) && exists(${GCCBASE}/bin)
 _EXTRA_CC_DIRS=        ${GCCBASE}/bin
 .  endif
 .  for _dir_ in ${_EXTRA_CC_DIRS} ${PATH:C/\:/ /g}
 .    if empty(_CC:M/*)
-.      if exists(${_dir_}/${CC:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//})
-_CC:=  ${_dir_}/${CC:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+.      if exists(${_dir_}/${CC:[1]})
+_CC:=  ${_dir_}/${CC:[1]}
 .      endif
 .    endif
 .  endfor