WinCE several touches

Message-ID: <007b01c1fabe$cc8cbbf0$785cc3d9@vad>

p4raw-id: //depot/perl@16582

diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 5903115..6e5016c 100644 (file)
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -1569,7 +1569,7 @@ sub init_main {
        $self->{PERL_ARCHLIB} = $self->{PERL_LIB};
        $self->{PERL_INC}     = ($Is_Win32) ? File::Spec->catdir($self->{PERL_LIB},"CORE") : $self->{PERL_SRC};
 
-       if (exists $INC{'Cross.pm'}) {
+       if (defined $::Cross::platform) {
            $self->{PERL_ARCHLIB} = File::Spec->catdir("$self->{PERL_SRC}","xlib",$::Cross::platform);
            $self->{PERL_INC}     = File::Spec->catdir("$self->{PERL_SRC}","xlib",$::Cross::platform, $Is_Win32?("CORE"):());
        }
@@ -1824,7 +1824,7 @@ sub init_INST {
     unless ($self->{INST_LIB}){
        if ($self->{PERL_CORE}) {
            $self->{INST_LIB} = $self->{INST_ARCHLIB} = $self->{PERL_LIB};
-           if (exists $INC{'Cross.pm'}) {
+           if (defined $::Cross::platform) {
                $self->{INST_LIB} = $self->{INST_ARCHLIB} = File::Spec->catdir($self->{PERL_LIB},"..","xlib",$::Cross::platform);
            }
        } else {

diff --git a/utf8.c b/utf8.c
index 472a89f..efcc602 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -1348,7 +1348,7 @@ Perl_to_utf8_case(pTHX_ U8 *p, U8* ustrp, STRLEN *lenp, SV **swashp, char *norma
         HE *he;
         SV *val;
        
-#if defined(UNDER_CE) && defined(MIPS)
+#if defined(UNDER_CE)
 /*strange: compiler complaints that I redefine macro UVXf and points where
            it was first defined. I copied line from there without any changes.
            Nothing should change.

diff --git a/wince/Makefile.ce b/wince/Makefile.ce
index da36a2a..272769a 100644 (file)
--- a/wince/Makefile.ce
+++ b/wince/Makefile.ce
@@ -534,7 +534,7 @@ CFGH_TMPL   = config_H.ce
 #
 # filenames given to xsubpp must have forward slashes (since it puts
 # full pathnames in #line strings)
-XSUBPP         = $(HPERL) -I..\..\lib ..\$(EXTUTILSDIR)\xsubpp \
+XSUBPP         = $(HPERL) -I..\..\lib -MCross=$(CROSS_NAME) ...\$(EXTUTILSDIR)\xsubpp \
                -C++ -prototypes
 
 MICROCORE_SRC  =               \
@@ -760,7 +760,7 @@ all: hostminiperl $(MINIMOD) $(CONFIGPM) $(PERLEXE)
 $(DYNALOADER)$(o) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c
 
 $(CONFIGPM): .\config.h ..\config.sh ..\minimod.pl
-       cd .. && $(HPERL) configpm --cross=$(CROSS_NAME) --no-glossary
+        cd .. && $(HPERL) configpm --cross=$(CROSS_NAME) --no-glossary
        -mkdir $(XCOREDIR)
        $(XCOPY) ..\*.h $(XCOREDIR)\*.*
        $(XCOPY) *.h $(XCOREDIR)\*.*
@@ -784,8 +784,8 @@ perlmain.c : runperl.c
 $(DYNALOADER).c: $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM)
        if not exist $(AUTODIR) mkdir $(AUTODIR)
        cd $(EXTDIR)\$(*B)
-       $(HPERL) -I..\..\lib $(*B)_pm.PL
-       $(HPERL) -I..\..\lib XSLoader_pm.PL
+       $(HPERL) -I..\..\lib -MCross=$(CROSS_NAME) $(*B)_pm.PL
+       $(HPERL) -I..\..\lib -MCross=$(CROSS_NAME) XSLoader_pm.PL
        cd ..\..\wince
        $(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL)
        $(XCOPY) $(EXTDIR)\$(*B)\XSLoader.pm $(LIBDIR)\$(NULL)

diff --git a/wince/config_h.PL b/wince/config_h.PL
index 517a430..9446cdc 100644 (file)
--- a/wince/config_h.PL
+++ b/wince/config_h.PL
@@ -2,8 +2,8 @@
 BEGIN { warn "Running ".__FILE__."\n" };
 BEGIN 
  {
-  require "../lib/Config.pm";
-  die "../Config.pm:$@" if $@;
+  require "Config.pm";
+  die "Config.pm:$@" if $@;
   Config::->import;
  }
 use File::Compare qw(compare);