[pkgsrc/trunk]: pkgsrc/mk Remove the trailing whitespace in the values of the...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3f7b946d3e2
branches:  trunk
changeset: 484857:b3f7b946d3e2
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Nov 30 15:07:26 2004 +0000

description:
Remove the trailing whitespace in the values of the toolchain variables
(CC, LD, CXX, etc.) if the default values have no arguments.  Now,
CC == "cc" and not "cc ".

diffstat:

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

diffs (42 lines):

diff -r 5c51a8e9e8e6 -r b3f7b946d3e2 mk/compiler.mk
--- a/mk/compiler.mk    Tue Nov 30 15:01:22 2004 +0000
+++ b/mk/compiler.mk    Tue Nov 30 15:07:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.40 2004/11/30 14:50:37 jlam Exp $
+# $NetBSD: compiler.mk,v 1.41 2004/11/30 15:07:26 jlam Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -128,7 +128,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 5c51a8e9e8e6 -r b3f7b946d3e2 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Tue Nov 30 15:01:22 2004 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Tue Nov 30 15:07:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.13 2004/11/30 14:50:37 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.14 2004/11/30 15:07:26 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -154,7 +154,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>.