[pkgsrc/trunk]: pkgsrc/mk The libtool wrapper should always do the compiler w...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a7f56bb8b42
branches:  trunk
changeset: 489034:9a7f56bb8b42
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Feb 15 03:18:50 2005 +0000

description:
The libtool wrapper should always do the compiler wrapper transformations,
so move the setting for _WRAP_ARG_PP.LIBTOOL out of conditional areas of
bsd.wrapper.mk and set it globally in bsd.buildlink3.mk with the rest of
the libtool wrapper variables.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |  8 +++++++-
 mk/wrapper/bsd.wrapper.mk       |  4 +---
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 69f51c68d5b9 -r 9a7f56bb8b42 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Tue Feb 15 00:42:12 2005 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Tue Feb 15 03:18:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.165 2004/11/30 14:50:37 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.166 2005/02/15 03:18:50 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1004,6 +1004,12 @@
 # We need to "unbuildlinkify" any libtool archives.
 _BLNK_WRAP_LT_UNTRANSFORM_SED= ${SUBST_SED.unwrap}
 
+# The libtool wrapper should do all of the same transformations as the
+# compiler wrapper since the primary mode of operation of the wrapper
+# assumes it's being in either compiler or link mode.
+#
+_WRAP_ARG_PP.LIBTOOL=          ${_WRAP_ARG_PP.CC}
+
 _WRAP_BUILDCMD.LIBTOOL=                ${WRAPPER_TMPDIR}/buildcmd-libtool
 _WRAP_CACHE.LIBTOOL=           ${WRAPPER_TMPDIR}/cache-libtool
 _WRAP_CACHE_BODY.LIBTOOL=      ${WRAPPER_TMPDIR}/cache-body-libtool
diff -r 69f51c68d5b9 -r 9a7f56bb8b42 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Tue Feb 15 00:42:12 2005 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Tue Feb 15 03:18:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.20 2005/02/14 21:33:08 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.21 2005/02/15 03:18:50 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -245,7 +245,6 @@
 _WRAP_ARG_PP.CXX=      ${_WRAP_ARG_PP.CC}
 _WRAP_CACHE_BODY.CXX=  ${_WRAP_CACHE_BODY.CC}
 _WRAP_TRANSFORM.CXX=   ${_WRAP_TRANSFORM.CC}
-_WRAP_ARG_PP.LIBTOOL=  ${_WRAP_ARG_PP.CC}
 .endif
 
 .if !empty(PKGSRC_COMPILER:Mmipspro-ucode)
@@ -295,7 +294,6 @@
 _WRAP_ARG_PP.CC=       ${WRAPPER_TMPDIR}/arg-pp-darwin-gcc
 _WRAP_ARG_PP.CXX=      ${_WRAP_ARG_PP.CC}
 _WRAP_ARG_PP.LD=       ${_WRAP_ARG_PP.CC}
-_WRAP_ARG_PP.LIBTOOL=  ${_WRAP_ARG_PP.CC}
 .elif ${OPSYS} == "UnixWare"
 _WRAP_CMD_SINK.CC=     ${WRAPPER_TMPDIR}/cmd-sink-unixware-gcc
 _WRAP_CMD_SINK.CXX=    ${_WRAP_CMD_SINK.CC}