Skip to content

Commit c0b8cc1

Browse files
Leontbingos
authored andcommitted
Only add staticlibs that are installed under auto/ (#293)
1 parent 58fa199 commit c0b8cc1

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

lib/ExtUtils/MM_Unix.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2578,7 +2578,7 @@ $(MAKE_APERL_FILE) : static $(FIRST_MAKEFILE) pm_to_blib
25782578
return if $File::Find::name =~ m:\Q$installed_version\E\z:;
25792579
use Cwd 'cwd';
25802580
$static{cwd() . "/" . $_}++;
2581-
}, grep( -d $_, @{$searchdirs || []}) );
2581+
}, grep( -d $_, map { $self->catdir($_, 'auto') } @{$searchdirs || []}) );
25822582

25832583
# We trust that what has been handed in as argument, will be buildable
25842584
$static = [] unless $static;

t/03-xsstatic.t

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ use MakeMaker::Test::Utils;
1111
use MakeMaker::Test::Setup::XS;
1212
use Test::More;
1313

14-
plan skip_all => "Disabled as broken perl installs give false negative"
15-
# if not static perl, and not author
16-
unless !$Config{usedl} or $ENV{AUTHOR_TESTING};
1714
plan skip_all => "ExtUtils::CBuilder not installed or couldn't find a compiler"
1815
unless have_compiler();
1916
plan skip_all => 'Shared perl library' if $Config{useshrplib} eq 'true';

0 commit comments

Comments
 (0)