[svn:parrot] r40098 - trunk/config/init

[allison at svn.parrot.org]

Author: allison
Date: Wed Jul 15 04:37:41 2009
New Revision: 40098
URL: https://trac.parrot.org/parrot/changeset/40098

Log:
[install] Stripping -rpath from dynamic linking options that are copied
from Perl when the --disable-rpath option is set. Resolves TT #830.
Thanks to Gerd Pokorra.

Modified:
   trunk/config/init/defaults.pm

Modified: trunk/config/init/defaults.pm
==============================================================================
--- trunk/config/init/defaults.pm	Wed Jul 15 03:25:10 2009	(r40097)
+++ trunk/config/init/defaults.pm	Wed Jul 15 04:37:41 2009	(r40098)
@@ -72,6 +72,9 @@
     # to their 'use English' names as documented in 'perlvar'.)
     $conf->data->set_p5( OSNAME => $^O );
 
+    my $ccdlflags = $Config{ccdlflags};
+    $ccdlflags =~ s/\s*-Wl,-rpath,\S*//g if $conf->options->get('disable-rpath');
+
     # We need a Glossary somewhere!
     $conf->data->set(
         debugging => $conf->options->get('debugging') ? 1 : 0,
@@ -112,7 +115,7 @@
         # Linker Flags to have this binary work with the shared and dynamically
         # loadable libraries we're building.  On HP-UX, for example, we need to
         # allow dynamic libraries to access the binary's symbols
-        link_dynamic => $Config{ccdlflags},    # e.g. -Wl,-E on HP-UX
+        link_dynamic => $ccdlflags,    # e.g. -Wl,-E on HP-UX
 
         # ld: Tool used to build shared libraries and dynamically loadable
         # modules. Often $cc on Unix-ish systems, but apparently sometimes