paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 01:27:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed cross-installation after r24625.

Browse Source 
git-svn-id: trunk@24626 -
This commit is contained in:
yury 2013-05-28 12:55:25 +00:00
parent 0db3e679a7
commit 4ca7e66661
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-05-26 rev 24621]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/05/28]
#
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 i386-android 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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd 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 arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android i8086-msdos
@ -436,8 +436,12 @@ export DIST_DESTDIR:=$(BASEDIR)
endif
BASEPACKDIR=$(BASEDIR)/basepack
ifndef FPCMAKENEW
ifdef CROSSCOMPILE
FPCMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(SRCEXEEXT)
else
FPCMAKENEW=$(BASEDIR)/utils/fpcm/bin/$(SOURCESUFFIX)/fpcmake$(SRCEXEEXT)
endif
endif
CLEANOPTS=FPC=$(PPNEW)
BUILDOPTS=FPC=$(PPNEW) FPCFPMAKE=$(FPCFPMAKENEW) RELEASE=1
INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
@ -2750,6 +2754,9 @@ endif
buildbase: base.$(BUILDSTAMP)
base.$(BUILDSTAMP):
$(MAKE) compiler_cycle RELEASE=1
ifdef CROSSCOMPILE
$(MAKE) -C utils/fpcm bootstrap $(BUILDOPTS)
endif
$(MAKE) rtl_clean $(CLEANOPTS)
$(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
$(ECHOREDIR) Build > base.$(BUILDSTAMP)

11
Makefile.fpc
View File

@ -169,8 +169,14 @@ BASEPACKDIR=$(BASEDIR)/basepack
# Always use newly created fpcmake
ifndef FPCMAKENEW
ifdef CROSSCOMPILE
# Use bootstrapped fpcmake when cross-compiling
FPCMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(SRCEXEEXT)
else
# Use normal fpcmake
FPCMAKENEW=$(BASEDIR)/utils/fpcm/bin/$(SOURCESUFFIX)/fpcmake$(SRCEXEEXT)
endif
endif
# Build/install options
CLEANOPTS=FPC=$(PPNEW)
@ -316,6 +322,11 @@ buildbase: base.$(BUILDSTAMP)
base.$(BUILDSTAMP):
# create new compiler
$(MAKE) compiler_cycle RELEASE=1
ifdef CROSSCOMPILE
# Buld a new native fpcmake when cross-compiling.
# Fresh native compiler and RTL are ready at this stage.
$(MAKE) -C utils/fpcm bootstrap $(BUILDOPTS)
endif
# clean
$(MAKE) rtl_clean $(CLEANOPTS)
# build everything