[pkgsrc/tv-derecurse]: pkgsrc/mk merge from HEAD

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c6da629886fc
branches:  tv-derecurse
changeset: 483972:c6da629886fc
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Nov 30 15:10:47 2004 +0000

description:
merge from HEAD

diffstat:

 mk/compiler.mk            |  6 +++++-
 mk/wrapper/bsd.wrapper.mk |  6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r b0d713791f1d -r c6da629886fc mk/compiler.mk
--- a/mk/compiler.mk    Tue Nov 30 15:06:34 2004 +0000
+++ b/mk/compiler.mk    Tue Nov 30 15:10:47 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.38.2.2 2004/11/30 15:06:34 tv Exp $
+# $NetBSD: compiler.mk,v 1.38.2.3 2004/11/30 15:10:47 tv Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -125,7 +125,11 @@
 # the PATH to use the correct executable.
 #
 .for _var_ in ${_COMPILER_STRIP_VARS}
+.  if empty(${_var_}:C/^/_asdf_/1:N_asdf_*)
+${_var_}:=     ${${_var_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//:T}
+.  else
 ${_var_}:=     ${${_var_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//:T} ${${_var_}:C/^/_asdf_/1:N_asdf_*}
+.  endif
 .endfor
 
 .if defined(ABI) && !empty(ABI)
diff -r b0d713791f1d -r c6da629886fc mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Tue Nov 30 15:06:34 2004 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Tue Nov 30 15:10:47 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.12.2.3 2004/11/30 15:06:35 tv Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.12.2.4 2004/11/30 15:10:47 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -146,7 +146,11 @@
 # Strip the leading paths from the toolchain variables since we manipulate
 # the PATH to use the correct executable.
 #
+.  if empty(${_wrappee_}:C/^/_asdf_/1:N_asdf_*)
+${_wrappee_}:=         ${${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//:T}
+.  else
 ${_wrappee_}:=         ${${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//:T} ${${_wrappee_}:C/^/_asdf_/1:N_asdf_*}
+.  endif
 #
 # WRAPPER_<wrappee> is the full path to the wrapper script, plus any
 # trailing arguments to <wrappee>.