From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Fri, 26 Apr 2002 20:04:44 +0000 (+0000)
Subject: NetBSD: if the /usr/pkg/lib is there, the linker wants
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b9685307624b4bf072ff40aa0bbc42ae36e58adf;p=p5sagit%2Fp5-mst-13.2.git

NetBSD: if the /usr/pkg/lib is there, the linker wants
to know about it always (not just when using the pth).

p4raw-id: //depot/perl@16197
---

diff --git a/hints/netbsd.sh b/hints/netbsd.sh
index f41a5b8..6a2ff11 100644
--- a/hints/netbsd.sh
+++ b/hints/netbsd.sh
@@ -88,9 +88,6 @@ $define|true|[yY]*)
         if pkg_info -qe pth; then 
             # Add -lpthread. 
             libswanted="$libswanted pthread" 
-            # -R so that we find the libpthread.so from /usr/pkg/lib
-            # during Configure and build.
-            ldflags="-R/usr/pkg/lib $ldflags" 
             # There is no libc_r as of NetBSD 1.5.2, so no c -> c_r. 
         else 
             echo "$0: You need to install the GNU pth.  Aborting." >&4 
@@ -101,6 +98,9 @@ esac
 EOCBU
 
 # Recognize the NetBSD packages collection.
-# GDBM might be here.
-test -d /usr/pkg/lib     && loclibpth="$loclibpth /usr/pkg/lib"
+# GDBM might be here, pth might be there.
+if test -d /usr/pkg/lib; then
+	loclibpth="$loclibpth /usr/pkg/lib"
+	ldflags="$ldflags -R/usr/pkg/lib"
+fi
 test -d /usr/pkg/include && locincpth="$locincpth /usr/pkg/include"