* To build fpmake while cross-compiling, use the compiler that is used

   while cycling the compiler to build the native rtl. (bug 19263)

git-svn-id: trunk@17389 -

Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/04/21]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/01]
 #
 default: help
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -138,13 +138,6 @@ endif
 ifndef FPC
 FPC=$(FPCNATIVE)
 endif
-ifndef FPCFPMAKE
-ifdef CROSSOMPILE
-FPCFPMAKE=$(FPCNATIVE)
-else
-FPCFPMAKE=$(FPC)
-endif
-endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 FOUNDFPC:=$(strip $(wildcard $(FPC)))
@@ -160,7 +153,7 @@ endif
 ifndef FPC_VERSION
 FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
 endif
-export FPC FPCFPMAKE FPC_VERSION FPC_COMPILERINFO
+export FPC FPC_VERSION FPC_COMPILERINFO
 unexport CHECKDEPEND ALLDEPENDENCIES
 ifndef CPU_TARGET
 ifdef CPU_TARGET_DEFAULT
@@ -283,6 +276,18 @@ ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
+ifndef FPCFPMAKE
+ifdef CROSSCOMPILE
+ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+FPCFPMAKE:=$(FPCNATIVE)
+else
+FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
+endif
+else
+FPCFPMAKE=$(FPC)
+endif
+endif
+export FPCFPMAKE
 override PACKAGE_NAME=fpc
 override PACKAGE_VERSION=2.5.1
 ifndef inOS2

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/04/25]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/01]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -138,13 +138,6 @@ endif
 ifndef FPC
 FPC=$(FPCNATIVE)
 endif
-ifndef FPCFPMAKE
-ifdef CROSSOMPILE
-FPCFPMAKE=$(FPCNATIVE)
-else
-FPCFPMAKE=$(FPC)
-endif
-endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 FOUNDFPC:=$(strip $(wildcard $(FPC)))
@@ -160,7 +153,7 @@ endif
 ifndef FPC_VERSION
 FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
 endif
-export FPC FPCFPMAKE FPC_VERSION FPC_COMPILERINFO
+export FPC FPC_VERSION FPC_COMPILERINFO
 unexport CHECKDEPEND ALLDEPENDENCIES
 ifndef CPU_TARGET
 ifdef CPU_TARGET_DEFAULT
@@ -283,6 +276,18 @@ ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
+ifndef FPCFPMAKE
+ifdef CROSSCOMPILE
+ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+FPCFPMAKE:=$(FPCNATIVE)
+else
+FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
+endif
+else
+FPCFPMAKE=$(FPC)
+endif
+endif
+export FPCFPMAKE
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-js fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2 hermes  fv fcl-web fastcgi fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid ldap modplug dts mad  gdbm tcl syslog libcurl opengl opencl cairo gtk1 gtk2 librsvg a52 bfd aspell svgalib newt cdrom users  iconvenc libxml proj4 fcl-extra zorba imlib utmp  fpgtk openal lua oggvorbis xforms fftw pcap ggi sdl openssl gnome1 httpd13 httpd20 httpd22 pxlib numlib gmp libsee ptc graph libc unixutil graph pxlib bzip2
 endif

packages/fpmkunit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/04/25]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/01]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -138,13 +138,6 @@ endif
 ifndef FPC
 FPC=$(FPCNATIVE)
 endif
-ifndef FPCFPMAKE
-ifdef CROSSOMPILE
-FPCFPMAKE=$(FPCNATIVE)
-else
-FPCFPMAKE=$(FPC)
-endif
-endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 FOUNDFPC:=$(strip $(wildcard $(FPC)))
@@ -160,7 +153,7 @@ endif
 ifndef FPC_VERSION
 FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
 endif
-export FPC FPCFPMAKE FPC_VERSION FPC_COMPILERINFO
+export FPC FPC_VERSION FPC_COMPILERINFO
 unexport CHECKDEPEND ALLDEPENDENCIES
 ifndef CPU_TARGET
 ifdef CPU_TARGET_DEFAULT
@@ -283,6 +276,18 @@ ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
+ifndef FPCFPMAKE
+ifdef CROSSCOMPILE
+ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+FPCFPMAKE:=$(FPCNATIVE)
+else
+FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
+endif
+else
+FPCFPMAKE=$(FPC)
+endif
+endif
+export FPCFPMAKE
 override PACKAGE_NAME=fpmkunit
 override PACKAGE_VERSION=2.5.1
 TARGET_UNITDIRBS=units_bs/$(SOURCESUFFIX)

utils/fpcm/fpcmake.ini

@@ -208,15 +208,6 @@ ifndef FPC
 FPC=$(FPCNATIVE)
 endif
 
-# If FPCFPMAKE is not set and we're cross-compiling, use the native compiler.
-ifndef FPCFPMAKE
-ifdef CROSSOMPILE
-FPCFPMAKE=$(FPCNATIVE)
-else
-FPCFPMAKE=$(FPC)
-endif
-endif
-
 # Get a clean executable name
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
@@ -242,7 +233,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
 endif
 
-export FPC FPCFPMAKE FPC_VERSION FPC_COMPILERINFO
+export FPC FPC_VERSION FPC_COMPILERINFO
 # CHECKDEPEND should not be exported
 # This should limit multiple checks
 unexport CHECKDEPEND ALLDEPENDENCIES
@@ -335,6 +326,29 @@ endif
 
 export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
 
+[fpmakefpcdetect]
+#####################################################################
+# FPC Binary and Version Detection
+#####################################################################
+# If FPCFPMAKE is not set and we're cross-compiling, use the native compiler.
+ifndef FPCFPMAKE
+ifdef CROSSCOMPILE
+# Search for the (native) ppc compiler which is used to do the latest build
+# of the native rtl
+ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+# If that compiler is not found, use the common, installed native compiler
+FPCFPMAKE:=$(FPCNATIVE)
+else
+# Use the ppc compiler. Because the path to the compiler is relative, do not
+# evaluate the variable here, but do that on the fly.
+FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
+endif
+else
+FPCFPMAKE=$(FPC)
+endif
+endif
+
+export FPCFPMAKE
 
 [fpcdircheckenv]
 #####################################################################

utils/fpcm/fpcmwr.pp

@@ -747,6 +747,7 @@ implementation
            AddIniSection('fpcdetect');
            AddIniSection('fpcdircheckenv');
            AddIniSection('fpcdirdetect');
+           AddIniSection('fpmakefpcdetect');
            { Package }
            AddVariable('package_name');
            AddVariable('package_version');