X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/ee2af9402f11b0fb62b6f9b75a86d538b90c7e74..HEAD:/write_buildcustomize.pl

diff --git a/write_buildcustomize.pl b/write_buildcustomize.pl
index 68e300f..9a784fe 100644
--- a/write_buildcustomize.pl
+++ b/write_buildcustomize.pl
@@ -22,8 +22,11 @@ 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
@@ -38,17 +41,19 @@ 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
 		   );
 
-# Text-ParseWords used only in ExtUtils::Liblist::Kid::_win32_ext()
-# the rest are for XS building on Win32, since nonxs and xs build simultaneously
+# These are for XS building on Win32, since nonxs and xs build simultaneously
 # on Win32 if parallel building
 push @toolchain, qw(
-	cpan/Text-ParseWords/lib
 	dist/ExtUtils-ParseXS/lib
-	cpan/Getopt-Long/lib
 	cpan/parent/lib
 	cpan/ExtUtils-Constant/lib
+    dist/base/lib
 ) if $^O eq 'MSWin32';
 push @toolchain, 'ext/VMS-Filespec/lib' if $^O eq 'VMS';
 
@@ -58,6 +63,9 @@ 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
 # written files are always masked by the complete versions.
@@ -87,7 +95,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__