X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=make_ext.pl;h=de26d8410a6221ad7b4412984f3710ac2c03fc2c;hb=e8163f9b21612cd7bfeb1e3e84bf7226ccb0475d;hp=81369b0510f9b91f77cbc6da777566c9f6a1dd20;hpb=e60ffd4f1584916e71476ec18523e5a74e213530;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/make_ext.pl b/make_ext.pl
index 81369b0..de26d84 100644
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -3,10 +3,21 @@ use strict;
 use warnings;
 use Config;
 BEGIN {
-    unshift @INC, $^O eq 'MSWin32' ? ('../cpan/Cwd', '../cpan/Cwd/lib') : 'cpan/Cwd';
+    if ($^O eq 'MSWin32') {
+	unshift @INC, ('../cpan/Cwd', '../cpan/Cwd/lib');
+	require File::Spec::Functions;
+	require FindExt;
+    }
+    else {
+	unshift @INC, 'cpan/Cwd';
+    }
 }
 use Cwd;
 
+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/
@@ -14,11 +25,19 @@ use Cwd;
 # After which, all nonxs modules are in lib, which was always sufficient to
 # allow miniperl to build everything else.
 
-my @toolchain = qw(ext/constant/lib cpan/Cwd cpan/Cwd/lib
-		   ext/ExtUtils-Command/lib
-		   dist/ExtUtils-Install/lib ext/ExtUtils-MakeMaker/lib
-		   ext/ExtUtils-Manifest/lib ext/Text-ParseWords/lib
-		   cpan/File-Path/lib cpan/AutoLoader/lib);
+# This list cannot get any longer without overflowing the length limit for
+# environment variables on VMS
+my @toolchain = qw(cpan/AutoLoader/lib
+		   cpan/Cwd cpan/Cwd/lib
+		   cpan/ExtUtils-Command/lib
+		   dist/ExtUtils-Install/lib
+		   cpan/ExtUtils-MakeMaker/lib
+		   cpan/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) . ')';
@@ -62,12 +81,6 @@ my $ext_dirs_re = '(?:' . join('|', @ext_dirs) . ')';
 # It may be deleted in a later release of perl so try to
 # avoid using it for other purposes.
 
-my $is_Win32 = $^O eq 'MSWin32';
-my $is_VMS = $^O eq 'VMS';
-my $is_Unix = !$is_Win32 && !$is_VMS;
-
-require FindExt if $is_Win32;
-
 my (%excl, %incl, %opts, @extspec, @pass_through);
 
 foreach (@ARGV) {
@@ -232,37 +245,36 @@ elsif ($is_VMS) {
     @extspec = (@first, @other);
 }
 
+if ($Config{osname} eq 'catamount' and @extspec) {
+    # Snowball's chance of building extensions.
+    die "This is $Config{osname}, not building $extspec[0], sorry.\n";
+}
+
 foreach my $spec (@extspec)  {
     my $mname = $spec;
     $mname =~ s!/!::!g;
     my $ext_pathname;
-    if (-d "ext/$spec"
-	# Temporary hack to cope with smokers that are not clearing directories:
-	&& $spec =~ m!/!
-       ) {
-	# Old style ext/Data/Dumper/
-	$ext_pathname = "ext/$spec";
-    } else {
-	# New style ext/Data-Dumper/
-	my $copy = $spec;
-	$copy =~ tr!/!-!;
-	foreach my $dir (@ext_dirs) {
-	    if (-d "$dir/$copy") {
-		$ext_pathname = "$dir/$copy";
-		last;
-	    }
+
+    # Try new style ext/Data-Dumper/ first
+    my $copy = $spec;
+    $copy =~ tr!/!-!;
+    foreach my $dir (@ext_dirs) {
+	if (-d "$dir/$copy") {
+	    $ext_pathname = "$dir/$copy";
+	    last;
 	}
-	if (!defined $ext_pathname) {
+    }
+
+    if (!defined $ext_pathname) {
+	if (-d "ext/$spec") {
+	    # Old style ext/Data/Dumper/
+	    $ext_pathname = "ext/$spec";
+	} else {
 	    warn "Can't find extension $spec in any of @ext_dirs";
 	    next;
 	}
     }
 
-    if ($Config{osname} eq 'catamount') {
-	# Snowball's chance of building extensions.
-	die "This is $Config{osname}, not building $mname, sorry.\n";
-    }
-
     print "\tMaking $mname ($target)\n";
 
     build_extension($ext_pathname, $perl, $mname,
@@ -288,15 +300,11 @@ sub build_extension {
     # another process has half-written.
     my @new_inc = ((map {"$up/$_"} @toolchain), $lib_dir);
     if ($is_Win32) {
-	# It feels somewhat wrong putting this in a loop, but require caches
-	# results, so is fast for subsequent calls. To my mind it's clearer
-	# here than putting the require somewhere far from the code it relates
-	# to.
-	require File::Spec::Functions;
 	@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) {