X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/6de85bb45a5ea25528026a26cac854ee4dcdcd45..0a954c3f1e837da7f716af0447170db9d09406ee:/write_buildcustomize.pl?ds=sidebyside

diff --git a/write_buildcustomize.pl b/write_buildcustomize.pl
index 02c78f8..cf429a9 100644
--- 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/
@@ -20,7 +27,7 @@ my $file = 'lib/buildcustomize.pl';
 
 my @toolchain = qw(cpan/AutoLoader/lib
 		   dist/Carp/lib
-		   dist/Cwd dist/Cwd/lib
+		   dist/PathTools dist/PathTools/lib
 		   dist/ExtUtils-Command/lib
 		   dist/ExtUtils-Install/lib
 		   cpan/ExtUtils-MakeMaker/lib
@@ -30,6 +37,8 @@ my @toolchain = qw(cpan/AutoLoader/lib
 		   dist/Term-ReadLine/lib
                    dist/Exporter/lib
                    ext/File-Find/lib
+                   cpan/Text-Tabs/lib
+		   dist/constant/lib
 		   );
 
 # Used only in ExtUtils::Liblist::Kid::_win32_ext()
@@ -45,7 +54,10 @@ require File::Spec::Functions;
 
 my $inc = join ",\n        ",
     map { "q\0$_\0" }
-    (map {File::Spec::Functions::rel2abs($_)} @toolchain, 'lib'), '.';
+    (map {File::Spec::Functions::rel2abs($_)} (
+# faster build on the non-parallel Win32 build process
+        $^O eq 'MSWin32' ? ('lib', @toolchain ) : (@toolchain, 'lib')
+    ));
 
 open my $fh, '>', $file
     or die "Can't open $file: $!";
@@ -58,10 +70,16 @@ my $error;
 print $fh <<"EOT" or $error = "Can't print to $file: $!";
 #!perl
 
+#   !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
+#   This file is generated by write_buildcustomize.pl.
+#   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.
+${\($^O eq 'MSWin32' ? '${^WIN32_SLOPPY_STAT} = 1;':'')}
+splice(\@INC, 0, 1, $inc);
+\$^O = '$osname';
 EOT
 
 if ($error) {