pl2bat.pl now needs access to ExtUtils::PL2Bat

[perl5.git] / write_buildcustomize.pl

diff --git a/write_buildcustomize.pl b/write_buildcustomize.pl
index 5d819b5..d25ef75 100644 (file)
--- a/write_buildcustomize.pl
+++ b/write_buildcustomize.pl
@@ -22,13 +22,15 @@ if ( @ARGV ) {
 # 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/PathTools dist/PathTools/lib
-                  cpan/ExtUtils-Command/lib
                   cpan/ExtUtils-Install/lib
                   cpan/ExtUtils-MakeMaker/lib
                   cpan/ExtUtils-Manifest/lib
@@ -39,14 +41,29 @@ my @toolchain = qw(cpan/AutoLoader/lib
                    ext/File-Find/lib
                    cpan/Text-Tabs/lib
                   dist/constant/lib
+                  cpan/version/lib
+                  cpan/Getopt-Long/lib
+                  cpan/Text-ParseWords/lib
+                   cpan/ExtUtils-PL2Bat/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
@@ -54,7 +71,7 @@ require File::Spec::Functions;
 
 my $inc = join ",\n        ",
     map { "q\0$_\0" }
-    (map {File::Spec::Functions::rel2abs($_)} (
+    (map {File::Spec::Functions::rel2abs($_, $cwd)} (
 # faster build on the non-parallel Win32 build process
         $^O eq 'MSWin32' ? ('lib', @toolchain ) : (@toolchain, 'lib')
     ));
@@ -77,7 +94,6 @@ print $fh <<"EOT" or $error = "Can't print to $file: $!";
 # We are miniperl, building extensions
 # 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';
 __END__