Change 13587 by jhi@alpha on 2001/12/10 03:38:20
Make the whole -lperl thing NetBSD only until we
find some other platform that needs the same.
Affected files ...
.... //depot/perl/lib/ExtUtils/MM_Unix.pm#129 edit
Differences ...
==== //depot/perl/lib/ExtUtils/MM_Unix.pm#129 (text) ====
Index: perl/lib/ExtUtils/MM_Unix.pm
--- perl/lib/ExtUtils/MM_Unix.pm.~1~ Sun Dec 9 20:45:06 2001
+++ perl/lib/ExtUtils/MM_Unix.pm Sun Dec 9 20:45:06 2001
@@ -1088,12 +1088,6 @@
my $ldrun = qq{-rpath "$self->{LD_RUN_PATH}"}
if ($^O eq 'irix' && $self->{LD_RUN_PATH});
- my $libs = $self->{LDLOADLIBS};
-
- if ($^O eq 'netbsd') {
- $libs = '$(LLIBPERL)';
- }
-
# For example in AIX the shared objects/libraries from previous builds
# linger quite a while in the shared dynalinker cache even when nobody
# is using them. This is painful if one for instance tries to restart
@@ -1102,6 +1096,22 @@
push(@m,' $(RM_F) $@
');
+ my $libs = $self->{LDLOADLIBS};
+
+ if ($^O eq 'netbsd') {
+ # Use nothing on static perl platforms, and to the flags needed
+ # to link against the shared libperl library on shared perl
+ # platforms. We peek at lddlflags to see if we need -Wl,-R
+ # or -R to add paths to the run-time library search path.
+ if ($Config{'useshrplib'}) {
+ if ($Config{'lddlflags'} =~ /-Wl,-R/) {
+ $libs = '-L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE -lperl';
+ } elsif ($Config{'lddlflags'} =~ /-R/) {
+ $libs = '-L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE -lperl';
+ }
+ }
+ }
+
push(@m,
' LD_RUN_PATH="$(LD_RUN_PATH)" $(LD) '.$ldrun.' $(LDDLFLAGS) '.$ldfrom.
' $(OTHERLDFLAGS) -o $@ $(MYEXTLIB) $(PERL_ARCHIVE) '.$libs.' $(PERL_ARCHIVE_AFTER)
$(EXPORT_LIST)');
@@ -3215,19 +3225,6 @@
my($self, %attribs) = @_;
my(@m);
- # Set LLIBPERL to nothing on static perl platforms, and to the flags
- # needed to link against the shared libperl library on shared perl
- # platforms. We peek at lddlflags to see if we need -Wl,-R or -R
- # to add paths to the run-time library search path.
- #
- my($llibperl) = '';
- if ($Config{'useshrplib'}) {
- if ($Config{'lddlflags'} =~ /-Wl,-R/) {
- $llibperl = '-L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE -lperl';
- } elsif ($Config{'lddlflags'} =~ /-R/) {
- $llibperl = '-L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE -lperl';
- }
- }
push(@m,'LLIBPERL = '.$llibperl."\n");
push(@m,'
End of Patch.
