diff options
| -rw-r--r-- | make_ext.pl | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/make_ext.pl b/make_ext.pl index 56af041867..95d81f2ffc 100644 --- a/make_ext.pl +++ b/make_ext.pl @@ -6,6 +6,7 @@ BEGIN { if ($^O eq 'MSWin32') { unshift @INC, ('../cpan/Cwd', '../cpan/Cwd/lib'); require File::Spec::Functions; + require FindExt; } else { unshift @INC, 'cpan/Cwd'; @@ -13,6 +14,10 @@ BEGIN { } 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/ @@ -20,11 +25,20 @@ 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 +# This list cannot get any longer without overflowing the length limit for +# environment variables on VMS +my @toolchain = qw(cpan/AutoLoader/lib + 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); + dist/ExtUtils-Install/lib + ext/ExtUtils-MakeMaker/lib + ext/ExtUtils-Manifest/lib + cpan/File-Path/lib + ); + +# Used only in ExtUtils::Liblist::Kid::_win32_ext() +push @toolchain, 'ext/Text-ParseWords/lib' if $is_Win32; my @ext_dirs = qw(cpan dist ext); my $ext_dirs_re = '(?:' . join('|', @ext_dirs) . ')'; @@ -68,12 +82,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) { @@ -238,6 +246,11 @@ 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; @@ -263,11 +276,6 @@ foreach my $spec (@extspec) { } } - 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, |