package ExtUtils::Liblist;
-no warnings 'ambiguous'; # silence the -f() file tests.
-
@ISA = qw(ExtUtils::Liblist::Kid File::Spec);
sub lsdir {
# This kid package is to be used by MakeMaker. It will not work if
# $self is not a Makemaker.
-use 5.005_64;
+use 5.006_001;
# Broken out of MakeMaker from version 4.11
-our $VERSION = substr q$Revision: 1.26 $, 10;
+our $VERSION = substr q$Revision: 1.27 $, 10;
use Config;
use Cwd 'cwd';
foreach $thislib (split ' ', $potential_libs){
# Handle possible linker path arguments.
- if ($thislib =~ s/^(-[LR])//){ # save path flag type
+ if ($thislib =~ s/^(-[LR]|-Wl,-R)//){ # save path flag type
my($ptype) = $1;
unless (-d $thislib){
warn "$ptype$thislib ignored, directory does not exist\n"
if $verbose;
next;
}
+ my($rtype) = $ptype;
+ if (($ptype eq '-R') or ($ptype eq '-Wl,-R')) {
+ if ($Config{'lddlflags'} =~ /-Wl,-R/) {
+ $rtype = '-Wl,-R';
+ } elsif ($Config{'lddlflags'} =~ /-R/) {
+ $rtype = '-R';
+ }
+ }
unless ($self->file_name_is_absolute($thislib)) {
warn "Warning: $ptype$thislib changed to $ptype$pwd/$thislib\n";
$thislib = $self->catdir($pwd,$thislib);
}
push(@searchpath, $thislib);
push(@extralibs, "$ptype$thislib");
- push(@ldloadlibs, "$ptype$thislib");
+ push(@ldloadlibs, "$rtype$thislib");
next;
}