Win32 Liblist stop false positives on multi-LIB (RT-53676)

Author: mohawk2

lib/ExtUtils/Liblist/Kid.pm

@@ -373,19 +373,9 @@ sub _win32_ext {
 
 sub _win32_make_lib_search_list {
     my ( $potential_libs, $verbose ) = @_;
-
-    # If Config.pm defines a set of default libs, we always
-    # tack them on to the user-supplied list, unless the user
-    # specified :nodefault
-    my $libs = $Config{'perllibs'};
-    $potential_libs = join( ' ', $potential_libs, $libs ) if $libs and $potential_libs !~ /:nodefault/i;
     _debug( "Potential libraries are '$potential_libs':\n", $verbose );
-
     $potential_libs =~ s,\\,/,g;    # normalize to forward slashes
-
-    my @list = Text::ParseWords::quotewords( '\s+', 0, $potential_libs );
-
-    return @list;
+    Text::ParseWords::quotewords( '\s+', 0, $potential_libs );
 }
 
 sub _win32_default_search_paths {

lib/ExtUtils/MM_Any.pm

@@ -2432,9 +2432,9 @@ sub init_others {
     $self->{LIBS} = $self->_fix_libs($self->{LIBS});
 
     # Compute EXTRALIBS, BSLOADLIBS and LDLOADLIBS from $self->{LIBS}
-    foreach my $libs ( @{$self->{LIBS}} ){
+    foreach my $libs ( @{$self->{LIBS}} ) {
         $libs =~ s/^\s*(.*\S)\s*$/$1/; # remove leading and trailing whitespace
-        my(@libs) = $self->extliblist($libs);
+        my @libs = $self->extliblist($libs);
         if (grep $_, @libs[0..2]) {
             # LD_RUN_PATH now computed by ExtUtils::Liblist
             @$self{qw(EXTRALIBS BSLOADLIBS LDLOADLIBS LD_RUN_PATH)} = @libs;

lib/ExtUtils/MM_Win32.pm

@@ -123,7 +123,7 @@ Using \ for Windows, except for "gmake" where it is /.
 sub init_DIRFILESEP {
     my($self) = shift;
 
-    # The ^ makes sure its not interpreted as an escape in nmake
+    # The ^ makes sure it's not interpreted as an escape in nmake
     $self->{DIRFILESEP} = $self->is_make_type('nmake') ? '^\\' :
                           $self->is_make_type('dmake') ? '\\\\' :
                           $self->is_make_type('gmake') ? '/'
@@ -165,13 +165,26 @@ Adjustments are made for Borland's quirks needing -L to come first.
 
 =cut
 
+my @LIBS_VARNAMES = qw(EXTRALIBS BSLOADLIBS LDLOADLIBS LD_RUN_PATH);
 sub init_others {
     my $self = shift;
 
     $self->{LD}     ||= 'link';
     $self->{AR}     ||= 'lib';
 
     $self->SUPER::init_others;
+    # If Config.pm defines a set of default libs,
+    # add them to EXTRALIBS, BSLOADLIBS and LDLOADLIBS, unless the user
+    # specified :nodefault or gave no LIBS
+    if (grep /\S/ && !/:nodefault/i, @{$self->{LIBS}}) {
+        my @libs = $self->extliblist($Config{perllibs});
+        for my $ind (0..$#LIBS_VARNAMES) {
+          next unless my $to_add = $libs[$ind];
+          my $varname = $LIBS_VARNAMES[$ind];
+          $self->{$varname} .= ' ' if $self->{$varname};
+          $self->{$varname} .= $to_add;
+        }
+    }
 
     $self->{LDLOADLIBS} ||= $Config{libs};
     # -Lfoo must come first for Borland, so we put it in LDDLFLAGS

t/Liblist_Kid.t

@@ -7,6 +7,7 @@ use File::Spec;
 use Cwd;
 use File::Temp qw[tempdir];
 
+use ExtUtils::MakeMaker;
 use MakeMaker::Test::Utils;
 
 # Liblist wants to be an object which has File::Spec capabilities, so we
@@ -42,7 +43,7 @@ test_kid_win32() if $OS eq 'win32';
 # system configuration does not affect the test results.
 
 sub conf_reset {
-    my @save_keys = qw{ so dlsrc osname };
+    my @save_keys = qw{ so dlsrc osname make };
     my %save_config;
     @save_config{ @save_keys } = @Config{ @save_keys };
     %Config = %save_config;
@@ -129,7 +130,7 @@ sub test_kid_unix_os2 {
     my @out = _ext( '-L. -lfoo' );
     my $qlibre = qr/-L[^"]+\s+-lfoo/;
     like( $out[0], $qlibre, 'existing file results in quoted extralibs' );
-    like( $out[2], $qlibre, 'existing file results in quotes ldloadlibs' );
+    like( $out[2], $qlibre, 'existing file results in quoted ldloadlibs' );
     ok $out[3], 'existing file results in true LD_RUN_PATH';
     is_deeply [ _ext( '-L. -lnotthere' ) ], [ ('') x 4 ], 'non-present lib = empty';
     my $curr_dirspace = File::Spec->rel2abs( 'di r' );
@@ -140,6 +141,18 @@ sub test_kid_unix_os2 {
       my @got = _ext( '-ldir_test' );
       is_deeply \@got, [ '-ldir_test', '', '-ldir_test', 'di r' ], 'Config.libpth directories with spaces work' or diag explain \@got;
     }
+    my $mm = WriteMakefile(
+        NAME            => 'Big::Dummy',
+        VERSION    => '1.00',
+        LIBS => ['-L. -lfoo'],
+    );
+    like $mm->{LDLOADLIBS}, $qlibre, 'single LIBS works';
+    $mm = WriteMakefile(
+        NAME            => 'Big::Dummy',
+        VERSION    => '1.00',
+        LIBS => ['-L. -lnotthere', '-L. -lfoo'],
+    );
+    like $mm->{LDLOADLIBS}, $qlibre, 'two LIBS correctly gets second';
 }
 
 sub test_kid_win32 {
@@ -178,10 +191,24 @@ sub test_kid_win32 {
     is_deeply( [ _ext( qq{"-Ldir" dir_test} ) ], [ double(quote("$curr\\dir\\dir_test.lib"), '') ], 'relative -L directories work' );
     is_deeply( [ _ext( '-L"di r" dir_test' ) ], [ double(quote($curr . '\di r\dir_test.lib'), '') ], '-L directories with spaces work' );
 
-    $Config{perllibs} = 'pl';
-    is_deeply( [ _ext( 'unreal_test' ) ], [ double(quote('pl.lib'), '') ], '$Config{perllibs} adds extra libs to be searched' );
-    is_deeply( [ _ext( 'unreal_test :nodefault' ) ], [ ('') x 4 ], ':nodefault flag prevents $Config{perllibs} from being added' );
-    delete $Config{perllibs};
+    {
+      local $Config{perllibs} = 'pl';
+      is_deeply( [ _ext( 'unreal_test' ) ], [ ('') x 4 ], '_ext not add $Config{perllibs}' );
+      is_deeply( [ _ext( 'unreal_test :nodefault' ) ], [ ('') x 4 ], ':nodefault flag prevents $Config{perllibs} from being added' );
+      my $mm = WriteMakefile(
+          NAME            => 'Big::Dummy',
+          VERSION    => '1.00',
+          LIBS => ['-l_test'],
+      );
+      my $exp = '"lib_test.lib" "pl.lib"';
+      is $mm->{LDLOADLIBS}, $exp, 'single LIBS works';
+      $mm = WriteMakefile(
+          NAME            => 'Big::Dummy',
+          VERSION    => '1.00',
+          LIBS => ['-L. -lnotthere', '-l_test'],
+      );
+      is $mm->{LDLOADLIBS}, $exp, 'two LIBS correctly gets second';
+    }
 
     {
       local $Config{libpth} = 'libpath';
@@ -219,6 +246,4 @@ sub test_kid_win32 {
 
     $ENV{LIB} = 'vc';
     is_deeply( [ _ext( 'vctest.lib' ) ], [ double(quote('vc\vctest.lib'), '') ], '[vc] $ENV{LIB} adds search paths' );
-
-    return;
 }