diff options
| author | tv <tv@pkgsrc.org> | 2004-11-30 15:10:47 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-11-30 15:10:47 +0000 |
| commit | b762c48867e6e73361e636b87e9549aedea853b9 (patch) | |
| tree | 65b12fff9e8bb750ba9949099cb6ba21e50cb136 | |
| parent | d6805004db4773e06f231f6d0fa63b00c54788c5 (diff) | |
| download | pkgsrc-b762c48867e6e73361e636b87e9549aedea853b9.tar.gz | |
merge from HEAD
| -rw-r--r-- | mk/compiler.mk | 6 | ||||
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mk/compiler.mk b/mk/compiler.mk index 848480f567e..110a38f5ddd 100644 --- a/mk/compiler.mk +++ b/mk/compiler.mk @@ -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 @@ _COMPILER_STRIP_VARS= # empty # 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 --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index 7012d236a8f..ee8be54c938 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -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 @@ _WRAPPEES_UNIQUE+= ${_wrappee_} # 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>. |