Import perl-5.20.1

2 files changed, 12 insertions, 6 deletions

diff --git a/gnu/usr.bin/perl/cpan/Module-Build/t/lib/DistGen.pm b/gnu/usr.bin/perl/cpan/Module-Build/t/lib/DistGen.pm
index ae8ed343907..52493724f5e 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/t/lib/DistGen.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/t/lib/DistGen.pm
@@ -15,7 +15,6 @@ use File::Basename ();
 use File::Find ();
 use File::Path ();
 use File::Spec ();
-use IO::File ();
 use Tie::CPHash;
 use Data::Dumper;
 
@@ -297,7 +296,7 @@ sub _gen_manifest {
   my $self     = shift;
   my $manifest = shift;
 
-  my $fh = IO::File->new( ">$manifest" ) or do {
+  open(my $fh, '>', $manifest ) or do {
     die "Can't write '$manifest'\n";
   };
 
@@ -368,7 +367,7 @@ sub regen {
         1 while unlink( $fullname );
       }
 
-      my $fh = IO::File->new(">$fullname") or do {
+      open(my $fh, '>', $fullname) or do {
         die "Can't write '$fullname'\n";
       };
       print $fh $self->{filedata}{$file};
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/t/lib/MBTest.pm b/gnu/usr.bin/perl/cpan/Module-Build/t/lib/MBTest.pm
index 0df382fc6aa..b12dc50e769 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/t/lib/MBTest.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/t/lib/MBTest.pm
@@ -2,7 +2,6 @@ package MBTest;
 
 use strict;
 
-use IO::File ();
 use File::Spec;
 use File::Temp ();
 use File::Path ();
@@ -159,7 +158,7 @@ sub stdout_stderr_of {
 }
 
 sub slurp {
-  my $fh = IO::File->new($_[0]) or die "Can't open $_[0]: $!";
+  open(my $fh, '<', $_[0]) or die "Can't open $_[0]: $!";
   local $/;
   return scalar <$fh>;
 }
@@ -198,7 +197,15 @@ sub find_in_path {
 }
 
 sub check_compiler {
-  return (1,1) if $ENV{PERL_CORE};
+  if ($ENV{PERL_CORE}) {
+    require IPC::Cmd;
+    if ( $Config{usecrosscompile} && !IPC::Cmd::can_run($Config{cc}) ) {
+      return;
+    }
+    else {
+      return(1,1);
+    }
+  }
 
   local $SIG{__WARN__} = sub {};