diff options
| -rw-r--r-- | makedef.pl | 17 | ||||
| -rw-r--r-- | win32/Makefile.ce | 2 |
2 files changed, 6 insertions, 13 deletions
diff --git a/makedef.pl b/makedef.pl index c69589d124..b69ad71680 100644 --- a/makedef.pl +++ b/makedef.pl @@ -77,18 +77,11 @@ if ($PLATFORM eq 'win32' or $PLATFORM eq 'wince' 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 $opts = ($PLATFORM eq 'wince' ? '-MCross' : ''); # for wince need Cross.pm to get Config.pm - - $ENV{PERL5LIB} = join $Config{path_sep}, @INC; - my $cmd = "$^X $opts -V"; - my $config = `$cmd` - or die "Couldn't run [$cmd]: $!"; - my($options) = $config =~ /^ Compile-time options: (.*?)\n^ \S/ms; - $options =~ s/\s+/ /g; - print STDERR "Options: ($options)\n"; - foreach (split /\s+/, $options) { - $define{$_} = 1; - } + + my @options + = sort(Config::bincompat_options(), Config::non_bincompat_options()); + print STDERR "Options: (@options)\n"; + $define{$_} = 1 foreach @options; } my %exportperlmalloc = diff --git a/win32/Makefile.ce b/win32/Makefile.ce index b1bf152611..39a6b585cc 100644 --- a/win32/Makefile.ce +++ b/win32/Makefile.ce @@ -847,7 +847,7 @@ $(DLLDIR)\perllib$(o) : perllib.c .\perlhost.h .\vdir.h .\vmem.h perldll.def : $(HPERL) $(CONFIGPM) ..\global.sym ..\makedef.pl create_perllibst_h.pl $(HPERL) -MCross -I..\lib create_perllibst_h.pl - $(HPERL) -w ..\makedef.pl PLATFORM=wince $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \ + $(HPERL) -MCross -w ..\makedef.pl PLATFORM=wince $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \ CCTYPE=$(CCTYPE) -DPERL_DLL=$(PERLDLL) TARG_DIR=..\ > perldll.def $(PERLDLL) : $(DLLDIR) perldll.def $(XDLLOBJS) $(PERLDLL_RES) |