Moved bignum from lib/ to ext/

[p5sagit/p5-mst-13.2.git] / make_ext.pl

diff --git a/make_ext.pl b/make_ext.pl
index cfc12c2..3762d0a 100644 (file)
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -4,6 +4,17 @@ use warnings;
 use Config;
 use Cwd;
 
+# 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.
+
+my @toolchain = qw(ext/constant/lib ext/ExtUtils-Command/lib
+                  ext/ExtUtils-Install/lib ext/ExtUtils-MakeMaker/lib
+                  ext/ExtUtils-Manifest/lib ext/Text-ParseWords/lib);
+
 # This script acts as a simple interface for building extensions.
 
 # It's actually a cut and shut of the Unix version ext/utils/makeext and the
@@ -16,7 +27,8 @@ use Cwd;
 #
 # On Windows or VMS,
 # If '--static' is specified, static extensions will be built.
-# If '--dynamic' is specified, dynamic (and nonxs) extensions will be built.
+# If '--dynamic' is specified, dynamic extensions will be built.
+# If '--nonxs' is specified, nonxs extensions will be built.
 # If '--all' is specified, all extensions will be built.
 #
 #    make_ext.pl "MAKE=make [-make_opts]" --dir=directory [--target=target] [--static|--dynamic|--all] +ext2 !ext1
@@ -67,6 +79,7 @@ foreach (@ARGV) {
 
 my $static = $opts{static} || $opts{all};
 my $dynamic = $opts{dynamic} || $opts{all};
+my $nonxs = $opts{nonxs} || $opts{all};
 
 # The Perl Makefile.SH will expand all extensions to
 #      lib/auto/X/X.a  (or lib/auto/X/Y/Y.a if nested)
@@ -126,7 +139,7 @@ if ($target eq '') {
     die "$0: unknown make target '$target'\n";
 }
 
-if (!@extspec and !$static and !$dynamic)  {
+if (!@extspec and !$static and !$dynamic and !$nonxs)  {
     die "$0: no extension specified\n";
 }
 
@@ -157,7 +170,8 @@ if ($is_Win32) {
 
     my @ext;
     push @ext, FindExt::static_ext() if $static;
-    push @ext, FindExt::dynamic_ext(), FindExt::nonxs_ext() if $dynamic;
+    push @ext, FindExt::dynamic_ext() if $dynamic;
+    push @ext, FindExt::nonxs_ext() if $nonxs;
 
     foreach (sort @ext) {
        if (%incl and !exists $incl{$_}) {
@@ -179,7 +193,7 @@ elsif ($is_VMS) {
     $perl = $^X;
     push @extspec, (split ' ', $Config{static_ext}) if $static;
     push @extspec, (split ' ', $Config{dynamic_ext}) if $dynamic;
-    push @extspec, (split ' ', $Config{nonxs_ext}) if $dynamic;
+    push @extspec, (split ' ', $Config{nonxs_ext}) if $nonxs;
 }
 
 foreach my $spec (@extspec)  {
@@ -216,7 +230,8 @@ sub build_extension {
     $perl ||= "$up/miniperl";
     my $return_dir = $up;
     my $lib_dir = "$up/lib";
-    $ENV{PERL5LIB} = $lib_dir;
+    $ENV{PERL5LIB}
+       = join $Config{path_sep}, $lib_dir, map {"$up/$_"} @toolchain;
 
     unless (chdir "$ext_dir") {
        warn "Cannot cd to $ext_dir: $!";