diff options
| author | jlam <jlam@pkgsrc.org> | 2005-02-15 03:18:50 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-02-15 03:18:50 +0000 |
| commit | fd9c46f153c02d596d63344850fb5b8c072f0a16 (patch) | |
| tree | 57cbea82d306f483bfeb9364fa9ec0b95186b343 | |
| parent | 2ca9736acf03ca35cc89fb8818a07aad43cca99e (diff) | |
| download | pkgsrc-fd9c46f153c02d596d63344850fb5b8c072f0a16.tar.gz | |
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.
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 8 | ||||
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 34d7ac51da5..b9d741db267 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -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 @@ _BLNK_LIBTOOL_FIX_LA= ${WRAPPER_TMPDIR}/libtool-fix-la # 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 --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index 57e0ecf545f..e5eac5ccd48 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -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_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-mipspro-cc _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_CMD_SINK.LD= ${WRAPPER_TMPDIR}/cmd-sink-interix-ld _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} |