wrong setting in canned win32/config.vc64 file

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

diff --git a/makedef.pl b/makedef.pl
index 890f6b0..b98f65c 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -36,7 +36,7 @@ my %PLATFORM;
 defined $PLATFORM || die "PLATFORM undefined, must be one of: @PLATFORM\n";
 exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n";
 
-if ($PLATFORM eq 'win32' or $PLATFORM eq "aix") {
+if ($PLATFORM eq 'win32' or $PLATFORM eq 'wince' or $PLATFORM eq "aix") {
        # Add the compile-time options that miniperl was built with to %define.
        # On Win32 these are not the same options as perl itself will be built
        # with since miniperl is built with a canned config (one of the win32/
@@ -45,7 +45,8 @@ if ($PLATFORM eq 'win32' or $PLATFORM eq "aix") {
        # source files and header files and don't include any BUILDOPT's that
        # the user might have chosen to disable because the canned configs are
        # minimal configs that don't include any of those options.
-       my $config = `$^X -Ilib -V`;
+       my $opts = ($PLATFORM eq 'wince' ? '-MCross' : ''); # for wince need Cross.pm to get Config.pm
+       my $config = `$^X $opts -Ilib -V`;
        my($options) = $config =~ /^  Compile-time options: (.*?)\n^  \S/ms;
        $options =~ s/\s+/ /g;
        print STDERR "Options: ($options)\n";
@@ -250,7 +251,6 @@ if ($PLATFORM eq 'win32') {
                     PL_linestart
                     PL_modcount
                     PL_pending_ident
-                    PL_sortcxix
                     PL_sublex_info
                     PL_timesbuf
                     main
@@ -308,7 +308,6 @@ if ($PLATFORM eq 'wince') {
                     PL_linestart
                     PL_modcount
                     PL_pending_ident
-                    PL_sortcxix
                     PL_sublex_info
                     PL_timesbuf
                     PL_collation_ix
@@ -509,7 +508,6 @@ elsif ($PLATFORM eq 'netware') {
                        PL_linestart
                        PL_modcount
                        PL_pending_ident
-                       PL_sortcxix
                        PL_sublex_info
                        PL_timesbuf
                        main
@@ -583,6 +581,7 @@ unless ($define{'DEBUGGING'}) {
                    Perl_debprofdump
                    Perl_debstack
                    Perl_debstackptrs
+                   Perl_pad_sv
                    Perl_sv_peek
                    PL_block_type
                    PL_watchaddr
@@ -662,12 +661,6 @@ else {
                    )];
 }
 
-unless ($define{'PERL_MALLOC_WRAP'}) {
-    skip_symbols [qw(
-                   PL_memory_wrap
-                   )];
-}
-
 if ($define{'PERL_USE_SAFE_PUTENV'}) {
     skip_symbols [qw(
                    PL_use_safe_putenv