Update Compress-Raw-Zlib to CPAN version 2.064

[perl5.git] / write_buildcustomize.pl

diff --git a/write_buildcustomize.pl b/write_buildcustomize.pl
index 20ac532..64bf4ce 100644 (file)
--- a/write_buildcustomize.pl
+++ b/write_buildcustomize.pl
@@ -1,13 +1,20 @@
 #!./miniperl -w
 
 use strict;
-if (@ARGV) {
+
+my $osname = $^O;
+my $file = 'lib/buildcustomize.pl';
+
+if ( @ARGV % 2 ) {
     my $dir = shift;
     chdir $dir or die "Can't chdir '$dir': $!";
     unshift @INC, 'lib';
 }
 
-my $file = 'lib/buildcustomize.pl';
+if ( @ARGV ) {
+    # Used during cross-compilation.
+    $osname = $ARGV[1];
+}
 
 # To clarify, this isn't the entire suite of modules considered "toolchain"
 # It's not even all modules needed to build ext/
@@ -47,7 +54,7 @@ require File::Spec::Functions;
 
 my $inc = join ",\n        ",
     map { "q\0$_\0" }
-    (map {File::Spec::Functions::rel2abs($_)} @toolchain, 'lib'), '.';
+    (map {File::Spec::Functions::rel2abs($_)} @toolchain, 'lib');
 
 open my $fh, '>', $file
     or die "Can't open $file: $!";
@@ -65,9 +72,10 @@ print $fh <<"EOT" or $error = "Can't print to $file: $!";
 #   Any changes made here will be lost!
 
 # We are miniperl, building extensions
-# Reset \@INC completely, adding the directories we need, and removing the
-# installed directories (which we don't need to read, and may confuse us)
-\@INC = ($inc);
+# Replace the first entry of \@INC ("lib") with the list of
+# directories we need.
+splice(\@INC, 0, 1, $inc);
+\$^O = '$osname';
 EOT
 
 if ($error) {