summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL3
-rw-r--r--perl.h6
-rw-r--r--perlio.c6
-rw-r--r--win32/Makefile.ce6
-rw-r--r--win32/config.ce3
-rw-r--r--win32/config_H.ce4
6 files changed, 20 insertions, 8 deletions
diff --git a/INSTALL b/INSTALL
index 36e738e6f5..5da1d9ad3a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1971,7 +1971,8 @@ has to be used is C<-Dusecrosscompile>.
sh ./Configure -des -Dusecrosscompile -D...
This will make the cpp symbol USE_CROSS_COMPILE and the %Config
-symbol C<usecrosscompile> available.
+symbol C<usecrosscompile> available, and C<xconfig.h> will be used
+for cross-compilation.
During the Configure and build, certain helper scripts will be created
into the Cross/ subdirectory. The scripts are used to execute a
diff --git a/perl.h b/perl.h
index 8e8d67bc01..f83cbf822c 100644
--- a/perl.h
+++ b/perl.h
@@ -34,7 +34,11 @@
#ifdef PERL_MICRO
# include "uconfig.h"
#else
-# include "config.h"
+# ifndef USE_CROSS_COMPILE
+# include "config.h"
+# else
+# include "xconfig.h"
+# endif
#endif
/* See L<perlguts/"The Perl API"> for detailed notes on
diff --git a/perlio.c b/perlio.c
index 6efc7cd853..288159c188 100644
--- a/perlio.c
+++ b/perlio.c
@@ -30,7 +30,11 @@
#ifdef PERL_MICRO
# include "uconfig.h"
#else
-# include "config.h"
+# ifndef USE_CROSS_COMPILE
+# include "config.h"
+# else
+# include "xconfig.h"
+# endif
#endif
#define PERLIO_NOT_STDIO 0
diff --git a/win32/Makefile.ce b/win32/Makefile.ce
index a948f71269..85a55e288e 100644
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -1,6 +1,8 @@
+#
# perl makefile for wince
+# During the cross-compilation, it first uses Makefile file to build
+# miniperl on HOST and then build required platform
#
-# Time-stamp: <26/10/01 15:10:06 keuchel@keuchelnt>
SRCDIR = ..
PV = 59
@@ -380,7 +382,7 @@ LIB=$(WCEROOT)\$(OSVERSION)\$(PLATFORM)\lib\$(ARCH)
# Additional compiler flags can be specified here.
#
-BUILDOPT = $(BUILDOPT) $(CECFLAGS)
+BUILDOPT = $(BUILDOPT) $(CECFLAGS) -DUSE_CROSS_COMPILE
!IF "$(CRYPT_SRC)$(CRYPT_LIB)" == ""
diff --git a/win32/config.ce b/win32/config.ce
index f189a9683a..d155e889ff 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -895,6 +895,7 @@ subversion='~SUBVERSION~'
sysman='/usr/man/man1'
tail=''
tar=''
+targetarch='wince'
tbl=''
tee=''
test=''
@@ -924,7 +925,7 @@ uquadtype='unsigned __int64'
use5005threads='undef'
use64bitall='undef'
use64bitint='undef'
-usecrosscompile='undef'
+usecrosscompile='define'
usedl='define'
usefaststdio='undef'
useithreads='~USE_ITHREADS~'
diff --git a/win32/config_H.ce b/win32/config_H.ce
index fa2b0a89d2..9809781f0b 100644
--- a/win32/config_H.ce
+++ b/win32/config_H.ce
@@ -914,8 +914,8 @@
* Perl has been cross-compiled to. Undefined if not a cross-compile.
*/
#ifndef USE_CROSS_COMPILE
-/*#define USE_CROSS_COMPILE /**/
-#define PERL_TARGETARCH "undef" /**/
+#define USE_CROSS_COMPILE /**/
+#define PERL_TARGETARCH "wince" /**/
#endif
/* MULTIARCH: