diff options
| author | schmonz <schmonz@pkgsrc.org> | 2002-06-10 13:28:23 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2002-06-10 13:28:23 +0000 |
| commit | 763997df7ee801b54651c7ca7a2e04525f67e068 (patch) | |
| tree | 4532bfec5b607f29e41cab58a8ce3bba7d5ec077 /mk | |
| parent | 4e38ff3567b753de7c5b37c90eb2c002ab2391ff (diff) | |
| download | pkgsrc-763997df7ee801b54651c7ca7a2e04525f67e068.tar.gz | |
If ${_USE_RPATH} == "no", strip any rpaths that may have managed
to sneak into LDFLAGS. From jlam, tested a bit by billc, approved
by agc.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f3416344fb1..f26eb32cfc6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.988 2002/06/10 11:40:53 skrll Exp $ +# $NetBSD: bsd.pkg.mk,v 1.989 2002/06/10 13:28:23 schmonz Exp $ # # This file is in the public domain. # @@ -355,7 +355,10 @@ LDFLAGS+= -L${X11BASE}/lib .endif .if ${_USE_RPATH} == "yes" LDFLAGS+= -Wl,-R${LOCALBASE}/lib +.else +LDFLAGS:= ${LDFLAGS:N*-Wl,-R*:N*-rpath*} .endif + .if !defined(USE_BUILDLINK_ONLY) LDFLAGS+= -L${LOCALBASE}/lib .endif |