summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-09-11 19:41:38 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-09-11 19:41:38 +0000
commit607688a7df6f3a21c0b3f4463871586443ee3c00 (patch)
tree84f5e90c6934e91adbfccf49b06046900ea2051b /gnu/usr.bin
parent467edb5025dc4788b2ee6325c5053bb16b30a4e9 (diff)
Pass ld the -R flag to add directories to the list of places to
search for shared objects instead of using a LD_RUN_PATH hack. We use -R here since it works with both the old and new (binutils) ld flavors. The LD_RUN_PATH hack was using the wrong directory anyway and so didn't even work. Problem pointed out by H. Steuer.
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/perl/Configure4
-rw-r--r--gnu/usr.bin/perl/config.over4
2 files changed, 5 insertions, 3 deletions
diff --git a/gnu/usr.bin/perl/Configure b/gnu/usr.bin/perl/Configure
index db370cde7ab..d101e8a7a3c 100644
--- a/gnu/usr.bin/perl/Configure
+++ b/gnu/usr.bin/perl/Configure
@@ -18,7 +18,7 @@
# you may fetch it yourself from your nearest archive site.)
#
-# $Id: Configure,v 1.8 2001/05/24 18:34:43 millert Exp $
+# $Id: Configure,v 1.9 2002/04/05 17:33:58 millert Exp $
#
# Generated on Tue Mar 13 05:21:04 EET 2001 [metaconfig 3.0 PL70]
# (with additional metaconfig patches by perlbug@perl.org)
@@ -6813,7 +6813,7 @@ if "$useshrplib"; then
solaris|netbsd)
xxx="-R $shrpdir"
;;
- freebsd)
+ freebsd|openbsd)
xxx="-Wl,-R$shrpdir"
;;
linux|irix*|dec_osf)
diff --git a/gnu/usr.bin/perl/config.over b/gnu/usr.bin/perl/config.over
index 8eb15ab450f..41b775439f8 100644
--- a/gnu/usr.bin/perl/config.over
+++ b/gnu/usr.bin/perl/config.over
@@ -1,7 +1,7 @@
#
# Override default paths when building in the OpenBSD src tree
#
-# $OpenBSD: config.over,v 1.9 2000/10/18 19:34:34 millert Exp $
+# $OpenBSD: config.over,v 1.10 2002/09/11 19:41:37 millert Exp $
#
# We use a different architecture name than the default
@@ -21,6 +21,8 @@ installarchlib="/usr/libdata/perl5/${archname}/${version}"
archlib="${installarchlib}:/usr/local/libdata/perl5/${archname}/${version}"
archlibexp="${archlib}"
+test $useshrplib = "true" && ccdlflags="-Wl,-R${installarchlib}/CORE"
+
installprivlib="/usr/libdata/perl5"
privlib="${installprivlib}:/usr/local/libdata/perl5"
privlibexp="${privlib}"