Correct ambiguous regex capture syntax.

[perl5.git] / make_ext.pl

diff --git a/make_ext.pl b/make_ext.pl
index b780ec9..6425e37 100644 (file)
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -4,11 +4,9 @@ use warnings;
 use Config;
 BEGIN {
     if ($^O eq 'MSWin32') {
-       unshift @INC, ('../dist/Cwd', '../dist/Cwd/lib');
-       require File::Spec::Functions;
+       unshift @INC, '../dist/Cwd';
        require FindExt;
-    }
-    else {
+    } else {
        unshift @INC, 'dist/Cwd';
     }
 }
@@ -18,27 +16,6 @@ my $is_Win32 = $^O eq 'MSWin32';
 my $is_VMS = $^O eq 'VMS';
 my $is_Unix = !$is_Win32 && !$is_VMS;
 
-# To clarify, this isn't the entire suite of modules considered "toolchain"
-# It's not even all modules needed to build ext/
-# It's just the source paths of the (minimum complete set of) modules in ext/
-# 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.
-
-# This list cannot get any longer without overflowing the length limit for
-# environment variables on VMS
-my @toolchain = qw(cpan/AutoLoader/lib
-                  dist/Cwd dist/Cwd/lib
-                  dist/ExtUtils-Command/lib
-                  dist/ExtUtils-Install/lib
-                  cpan/ExtUtils-MakeMaker/lib
-                  dist/ExtUtils-Manifest/lib
-                  cpan/File-Path/lib
-                  );
-
-# Used only in ExtUtils::Liblist::Kid::_win32_ext()
-push @toolchain, 'cpan/Text-ParseWords/lib' if $is_Win32;
-
 my @ext_dirs = qw(cpan dist ext);
 my $ext_dirs_re = '(?:' . join('|', @ext_dirs) . ')';
 
@@ -296,16 +273,7 @@ sub build_extension {
     $perl ||= "$up/miniperl";
     my $return_dir = $up;
     my $lib_dir = "$up/lib";
-    # $lib_dir must be last, as we're copying files into it, and in a parallel
-    # make there's a race condition if one process tries to open a module that
-    # another process has half-written.
-    my @new_inc = ((map {"$up/$_"} @toolchain), $lib_dir);
-    if ($is_Win32) {
-       @new_inc = map {File::Spec::Functions::rel2abs($_)} @new_inc;
-    }
-    $ENV{PERL5LIB} = join $Config{path_sep}, @new_inc;
     $ENV{PERL_CORE} = 1;
-    # warn $ENV{PERL5LIB};
 
     my $makefile;
     if ($is_VMS) {
@@ -409,6 +377,10 @@ WriteMakefile(
 EOM
            close $fh or die "Can't close Makefile.PL: $!";
        }
+  eval {
+    my $ftime = time - 4;
+    utime $ftime, $ftime, 'Makefile.PL';
+  };
        print "\nRunning Makefile.PL in $ext_dir\n";
 
        # Presumably this can be simplified
@@ -420,8 +392,8 @@ EOM
            # Inherited from make_ext.pl
            @cross = '-MCross';
        }
-           
-       my @args = (@cross, 'Makefile.PL');
+
+       my @args = ("-I$lib_dir", @cross, 'Makefile.PL');
        if ($is_VMS) {
            my $libd = VMS::Filespec::vmspath($lib_dir);
            push @args, "INST_LIB=$libd", "INST_ARCHLIB=$libd";
@@ -485,11 +457,9 @@ EOS
        # Give makefile an opportunity to rewrite itself.
        # reassure users that life goes on...
        my @args = ('config', @$pass_through);
-       _quote_args(\@args) if $is_VMS;
        system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
     }
     my @targ = ($target, @$pass_through);
-    _quote_args(\@targ) if $is_VMS;
     print "Making $target in $ext_dir\n@run @make @targ\n";
     my $code = system(@run, @make, @targ);
     die "Unsuccessful make($ext_dir): code=$code" if $code != 0;