pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/compiler mk/compiler: replace complicated :M_asdf_ ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7764146bbe72
branches:  trunk
changeset: 339867:7764146bbe72
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Sep 18 06:15:13 2019 +0000

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

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

diffstat:

 mk/compiler/gcc.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 2ecd40eba33a -r 7764146bbe72 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Tue Sep 17 23:37:05 2019 +0000
+++ b/mk/compiler/gcc.mk        Wed Sep 18 06:15:13 2019 +0000
@@ -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 @@
 
 # _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



Home | Main Index | Thread Index | Old Index