diff options
| author | jlam <jlam> | 2005-02-14 21:33:08 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-02-14 21:33:08 +0000 |
| commit | c778c13d023d7b48be38f77acc24c41cbfc67b92 (patch) | |
| tree | d93aae6269008bafaa2227ed32d69f1a21656d8b /mk | |
| parent | 8ad20ecba47c42148cae15720b2ceced9953d484 (diff) | |
| download | pkgsrc-c778c13d023d7b48be38f77acc24c41cbfc67b92.tar.gz | |
Teach the libtool wrapper about the same types of transformations that
the compiler wrapper already knows to do. This should protect
"-install_name ..." from wrapper transformations within the libtool
wrapper on Darwin and fixes PR pkg/29215.
Software that properly use libtool don't pass an explicit "-install_name
..." because libtool always generates its own such argument when
building the (Darwin) shared library. However, not every piece of
software, including the ones like lang/tcl that pkgsrc converted to
use libtool, will use libtool in the documented fashion. Longer term,
those packages should be fixed properly, but we will still need the
libtool wrapper to avoid transforming arguments that the compiler
wrapper itself doesn't transform, e.g. for MIPSpro and -LANG:*.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index b0c89f25465..57e0ecf545f 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.19 2005/01/18 17:25:13 jlam Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.20 2005/02/14 21:33:08 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -245,6 +245,7 @@ _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) @@ -294,6 +295,7 @@ _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} |