stop MacOS dropping LIBS=>"-framework X" with no "-l" libs

Author: mohawk2

lib/ExtUtils/Liblist/Kid.pm

@@ -86,8 +86,8 @@ sub _unix_os2_ext {
 
     if ($^O eq 'darwin')  {
         # 'escape' Mach-O ld -framework and -F flags, so they aren't dropped later on
-        $potential_libs =~ s/(^|\s)(-(?:weak_|reexport_|lazy_)?framework)\s+(\S+)/$1-Wl,$2 -Wl,$3/g;
-        $potential_libs =~ s/(^|\s)(-F)\s*(\S+)/$1-Wl,$2 -Wl,$3/g;
+        $found++ if $potential_libs =~ s/(^|\s)(-(?:weak_|reexport_|lazy_)?framework)\s+(\S+)/$1-Wl,$2 -Wl,$3/g;
+        $found++ if $potential_libs =~ s/(^|\s)(-F)\s*(\S+)/$1-Wl,$2 -Wl,$3/g;
     }
 
     foreach my $thislib ( Text::ParseWords::shellwords($potential_libs) ) {
@@ -271,12 +271,8 @@ sub _unix_os2_ext {
           unless $found_lib > 0;
     }
 
-    unless ( $found ) {
-        return ( '', '', '', '', ( $give_libs ? \@libs : () ) );
-    }
-    else {
-        return ( "@extralibs", "@bsloadlibs", "@ldloadlibs", join( ":", @ld_run_path ), ( $give_libs ? \@libs : () ) );
-    }
+    return ( '', '', '', '', ( $give_libs ? \@libs : () ) ) unless $found;
+    ( "@extralibs", "@bsloadlibs", "@ldloadlibs", join( ":", @ld_run_path ), ( $give_libs ? \@libs : () ) );
 }
 
 sub _win32_ext {

t/Liblist_Kid.t

@@ -133,6 +133,14 @@ sub test_kid_unix_os2 {
     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';
+    if ($^O eq 'darwin') {
+      my @got = _ext( '-framework Something -L. -lfoo' );
+      like $got[0], qr/Something/, '-framework with other lib works' or diag explain \@got;
+      like $got[2], qr/Something/, '-framework with other lib works' or diag explain \@got;
+      @got = _ext( '-framework Something' );
+      like $got[0], qr/Something/, 'no drop -framework without other lib' or diag explain \@got;
+      like $got[2], qr/Something/, 'no drop -framework without other lib' or diag explain \@got;
+    }
     my $curr_dirspace = File::Spec->rel2abs( 'di r' );
     my $cmd_frag = '-L'.quote($curr_dirspace) . ' -ldir_test';
     is_deeply [ _ext( '-L"di r" -ldir_test' ) ], [ $cmd_frag, '', $cmd_frag, $curr_dirspace ], '-L directories with spaces work';