diff options
| author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-05-01 16:48:56 +0000 |
|---|---|---|
| committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2011-05-01 16:48:56 +0000 |
| commit | 6d3ebff92553e5102cac359056753149e0f4514e (patch) | |
| tree | 89cb1ef5b6963508e84fae226d9a180174a1fd7d /packages/fpmkunit | |
| parent | 25dcd8fad4e00456e04fd49af5242ed68c169e23 (diff) | |
| download | fpc-6d3ebff92553e5102cac359056753149e0f4514e.tar.gz | |
* 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: http://svn.freepascal.org/svn/fpc/trunk@17389 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fpmkunit')
| -rw-r--r-- | packages/fpmkunit/Makefile | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/packages/fpmkunit/Makefile b/packages/fpmkunit/Makefile index f598ac90b1..b7f34bd651 100644 --- a/packages/fpmkunit/Makefile +++ b/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) |