diff options
| author | Michael G. Schwern <schwern@pobox.com> | 2003-05-22 19:10:46 -0700 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2003-05-23 13:06:25 +0000 |
| commit | 2530b651d288d7db98df4c0991f07a783a1cd32c (patch) | |
| tree | 46e6b3c07f57558c3f532f12d621104bc7c9d4c8 /lib/ExtUtils/Liblist | |
| parent | a0d8a30e4d6cdcb83a19818856ccc52190cdd95f (diff) | |
| download | perl-2530b651d288d7db98df4c0991f07a783a1cd32c.tar.gz | |
ExtUtils::MakeMaker 6.10_03 -> 6.10_04
Message-ID: <20030523091046.GB11662@windhund.schwern.org>
p4raw-id: //depot/perl@19594
Diffstat (limited to 'lib/ExtUtils/Liblist')
| -rw-r--r-- | lib/ExtUtils/Liblist/Kid.pm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/ExtUtils/Liblist/Kid.pm b/lib/ExtUtils/Liblist/Kid.pm index 9030eda00f..5d05680ba7 100644 --- a/lib/ExtUtils/Liblist/Kid.pm +++ b/lib/ExtUtils/Liblist/Kid.pm @@ -148,9 +148,6 @@ sub _unix_os2_ext { next; } warn "'-l$thislib' found at $fullname\n" if $verbose; - my($fullnamedir) = dirname($fullname); - push @ld_run_path, $fullnamedir - unless $ld_run_path_seen{$fullnamedir}++; push @libs, $fullname unless $libs_seen{$fullname}++; $found++; $found_lib++; @@ -161,6 +158,13 @@ sub _unix_os2_ext { my $is_dyna = ($fullname !~ /\Q$Config_libext\E\z/); my $in_perl = ($libs =~ /\B-l\Q${thislib}\E\b/s); + # include the path to the lib once in the dynamic linker path + # but only if it is a dynamic lib and not in Perl itself + my($fullnamedir) = dirname($fullname); + push @ld_run_path, $fullnamedir + if $is_dyna && !$in_perl && + !$ld_run_path_seen{$fullnamedir}++; + # Do not add it into the list if it is already linked in # with the main perl executable. # We have to special-case the NeXT, because math and ndbm |