Fix builds after EUMM update

[perl5.git] / write_buildcustomize.pl

diff --git a/write_buildcustomize.pl b/write_buildcustomize.pl
index 4916945..b161aab 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/
@@ -15,28 +22,47 @@ my $file = 'lib/buildcustomize.pl';
 # needed to build the nonxs modules
 # After which, all nonxs modules are in lib, which was always sufficient to
 # allow miniperl to build everything else.
+# Getopt::Long is here because it's used by podlators, which is one of the
+# nonxs modules.
 # Term::ReadLine is not here for building but for allowing the debugger to
 # run under miniperl when nothing but miniperl will build :-(.
+# Text::ParseWords is required in ExtUtils::Liblist::Kid
 
 my @toolchain = qw(cpan/AutoLoader/lib
                   dist/Carp/lib
-                  dist/Cwd dist/Cwd/lib
-                  dist/ExtUtils-Command/lib
-                  dist/ExtUtils-Install/lib
+                  dist/PathTools dist/PathTools/lib
+                  cpan/ExtUtils-Install/lib
                   cpan/ExtUtils-MakeMaker/lib
-                  dist/ExtUtils-Manifest/lib
+                  cpan/ExtUtils-Manifest/lib
                   cpan/File-Path/lib
                   ext/re
                   dist/Term-ReadLine/lib
                    dist/Exporter/lib
+                   ext/File-Find/lib
+                   cpan/Text-Tabs/lib
+                  dist/constant/lib
+                  cpan/version/lib
+                  cpan/Getopt-Long/lib
+                  cpan/Text-ParseWords/lib
                   );
 
-# Used only in ExtUtils::Liblist::Kid::_win32_ext()
-push @toolchain, 'cpan/Text-ParseWords/lib' if $^O eq 'MSWin32';
+# These are for XS building on Win32, since nonxs and xs build simultaneously
+# on Win32 if parallel building
+push @toolchain, qw(
+       dist/ExtUtils-ParseXS/lib
+       cpan/parent/lib
+       cpan/ExtUtils-Constant/lib
+) if $^O eq 'MSWin32';
 push @toolchain, 'ext/VMS-Filespec/lib' if $^O eq 'VMS';
 
 unshift @INC, @toolchain;
 require File::Spec::Functions;
+require Cwd;
+
+my $cwd  = Cwd::getcwd();
+
+defined $cwd
+  or die "$0: Can't determine current working directory\n";
 
 # lib must be last, as the toolchain modules write themselves into it
 # as they build, and it's important that @INC order ensures that the partially
@@ -44,7 +70,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($_, $cwd)} (
+# 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: $!";
@@ -57,10 +86,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.
+splice(\@INC, 0, 1, $inc);
+\$^O = '$osname';
+__END__
 EOT
 
 if ($error) {
@@ -81,9 +116,4 @@ unlink $file
     or warn "Can't unlink $file after error: $!";
 die $error;
 
-# Local variables:
-# cperl-indent-level: 4
-# indent-tabs-mode: nil
-# End:
-#
 # ex: set ts=8 sts=4 sw=4 et: