mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-12-01 23:17:42 +01:00
* Replaced dependeny on fpmkunit_bootstrap with dependency on fpmkunit itself. So that the dependency is also evaluated in non-crosscompile builds
* Make fpmkunit depending on fpmkunit_bootstrap, so that in case of a crosscompile the _bootstrap is always compiled before any packages depending on fpmkunit itself git-svn-id: trunk@17807 -
This commit is contained in:
joost
parent
8a0ed92957
commit
2f17dbbed3
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/22]
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/17]
|
||||
#
|
||||
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
|
||||
@ -107,37 +107,25 @@ FPC=$(PP)
|
||||
endif
|
||||
endif
|
||||
ifndef FPC
|
||||
DETERMINE_NATIVE_COMPILER=1
|
||||
else
|
||||
ifdef CROSSCOMPILE
|
||||
ifndef FPCFPMAKE
|
||||
DETERMINE_NATIVE_COMPILER=1
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifdef DETERMINE_NATIVE_COMPILER
|
||||
FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifneq ($(FPCPROG),)
|
||||
FPCPROG:=$(firstword $(FPCPROG))
|
||||
ifneq ($(CPU_TARGET),)
|
||||
FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
|
||||
FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
|
||||
else
|
||||
FPCNATIVE:=$(shell $(FPCPROG) -PB)
|
||||
FPC:=$(shell $(FPCPROG) -PB)
|
||||
endif
|
||||
ifneq ($(findstring Error,$(FPCNATIVE)),)
|
||||
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
|
||||
ifneq ($(findstring Error,$(FPC)),)
|
||||
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
|
||||
else
|
||||
ifeq ($(strip $(wildcard $(FPCNATIVE))),)
|
||||
FPCNATIVE:=$(firstword $(FPCPROG))
|
||||
ifeq ($(strip $(wildcard $(FPC))),)
|
||||
FPC:=$(firstword $(FPCPROG))
|
||||
endif
|
||||
endif
|
||||
else
|
||||
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
|
||||
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
|
||||
endif
|
||||
endif
|
||||
ifndef FPC
|
||||
FPC=$(FPCNATIVE)
|
||||
endif
|
||||
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
|
||||
override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
|
||||
FOUNDFPC:=$(strip $(wildcard $(FPC)))
|
||||
@ -279,14 +267,24 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
|
||||
ifndef FPCFPMAKE
|
||||
ifdef CROSSCOMPILE
|
||||
ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
|
||||
FPCFPMAKE:=$(FPCNATIVE)
|
||||
FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifneq ($(FPCPROG),)
|
||||
FPCPROG:=$(firstword $(FPCPROG))
|
||||
FPCFPMAKE:=$(shell $(FPCPROG) -PB)
|
||||
ifeq ($(strip $(wildcard $(FPCFPMAKE))),)
|
||||
FPCFPMAKE:=$(firstword $(FPCPROG))
|
||||
endif
|
||||
else
|
||||
override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
|
||||
endif
|
||||
else
|
||||
FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
|
||||
FPMAKE_SKIP_CONFIG=-n
|
||||
export FPCFPMAKE
|
||||
export FPMAKE_SKIP_CONFIG
|
||||
endif
|
||||
else
|
||||
FPCFPMAKE=$(FPC)
|
||||
export FPCFPMAKE
|
||||
endif
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
@ -9637,11 +9635,11 @@ fpmkunit_bootstrap:
|
||||
ifdef CROSSCOMPILE
|
||||
$(MAKE) -C fpmkunit bootstrap
|
||||
endif
|
||||
fpmkunit_all: fcl-base_all fcl-process_all paszlib_all
|
||||
fpmkunit_debug: fcl-base_debug fcl-process_debug paszlib_debug
|
||||
fpmkunit_smart: fcl-base_smart fcl-process_smart paszlib_smart
|
||||
fpmkunit_release: fcl-base_release fcl-process_release paszlib_release
|
||||
fpmkunit_shared: fcl-base_shared fcl-process_shared paszlib_shared
|
||||
fpmkunit_all: fpmkunit_bootstrap fcl-base_all fcl-process_all paszlib_all
|
||||
fpmkunit_debug: fpmkunit_bootstrap fcl-base_debug fcl-process_debug paszlib_debug
|
||||
fpmkunit_smart: fpmkunit_bootstrap fcl-base_smart fcl-process_smart paszlib_smart
|
||||
fpmkunit_release: fpmkunit_bootstrap fcl-base_release fcl-process_release paszlib_release
|
||||
fpmkunit_shared: fpmkunit_bootstrap fcl-base_shared fcl-process_shared paszlib_shared
|
||||
ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
|
||||
fcl-base_all: univint_all paszlib_all
|
||||
fcl-base_debug: univint_debug paszlib_debug
|
||||
@ -9744,16 +9742,16 @@ fcl-net_smart: fcl-passrc_smart fcl-xml_smart fcl-async_smart
|
||||
fcl-net_release: fcl-passrc_release fcl-xml_release fcl-async_release
|
||||
fcl-net_shared: fcl-passrc_shared fcl-xml_shared fcl-async_shared
|
||||
endif
|
||||
fcl-web_all: fpmkunit_bootstrap fcl-db_all fcl-xml_all fcl-process_all httpd22_all fastcgi_all fcl-net_all fcl-json_all
|
||||
fcl-web_debug: fpmkunit_bootstrap fcl-db_debug fcl-xml_debug fcl-process_debug httpd22_debug fastcgi_debug fcl-net_debug fcl-json_debug
|
||||
fcl-web_smart: fpmkunit_bootstrap fcl-db_smart fcl-xml_smart fcl-process_smart httpd22_smart fastcgi_smart fcl-net_smart fcl-json_smart
|
||||
fcl-web_release: fpmkunit_bootstrap fcl-db_release fcl-xml_release fcl-process_release httpd22_release fastcgi_release fcl-net_release fcl-json_release
|
||||
fcl-web_shared: fpmkunit_bootstrap fcl-db_shared fcl-xml_shared fcl-process_shared httpd22_shared fastcgi_shared fcl-net_shared fcl-json_shared
|
||||
fastcgi_all: fpmkunit_bootstrap
|
||||
fastcgi_debug: fpmkunit_bootstrap
|
||||
fastcgi_smart: fpmkunit_bootstrap
|
||||
fastcgi_release: fpmkunit_bootstrap
|
||||
fastcgi_shared: fpmkunit_bootstrap
|
||||
fcl-web_all: fpmkunit_all fcl-db_all fcl-xml_all fcl-process_all httpd22_all fastcgi_all fcl-net_all fcl-json_all
|
||||
fcl-web_debug: fpmkunit_debug fcl-db_debug fcl-xml_debug fcl-process_debug httpd22_debug fastcgi_debug fcl-net_debug fcl-json_debug
|
||||
fcl-web_smart: fpmkunit_smart fcl-db_smart fcl-xml_smart fcl-process_smart httpd22_smart fastcgi_smart fcl-net_smart fcl-json_smart
|
||||
fcl-web_release: fpmkunit_release fcl-db_release fcl-xml_release fcl-process_release httpd22_release fastcgi_release fcl-net_release fcl-json_release
|
||||
fcl-web_shared: fpmkunit_shared fcl-db_shared fcl-xml_shared fcl-process_shared httpd22_shared fastcgi_shared fcl-net_shared fcl-json_shared
|
||||
fastcgi_all: fpmkunit_all
|
||||
fastcgi_debug: fpmkunit_debug
|
||||
fastcgi_smart: fpmkunit_smart
|
||||
fastcgi_release: fpmkunit_release
|
||||
fastcgi_shared: fpmkunit_shared
|
||||
ifneq ($(findstring $(OS_TARGET),linux freebsd openbsd netbsd win32 beos haiku),)
|
||||
fcl-db_all: fcl-xml_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all pxlib_all
|
||||
fcl-db_debug: fcl-xml_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug pxlib_debug
|
||||
@ -9936,7 +9934,7 @@ opencl_debug: opengl_debug
|
||||
opencl_smart: opengl_smart
|
||||
opencl_release: opengl_release
|
||||
opencl_shared: opengl_shared
|
||||
ifeq ($(findstring $(OS_TARGET),go32v2 win32 win64 wince),)
|
||||
ifeq ($(findstring $(OS_TARGET),go32v2),)
|
||||
fppkg_all: fcl-web_all
|
||||
fppkg_debug: fcl-web_debug
|
||||
fppkg_smart: fcl-web_smart
|
||||
|
||||
@ -78,11 +78,11 @@ fpmkunit_bootstrap:
|
||||
ifdef CROSSCOMPILE
|
||||
$(MAKE) -C fpmkunit bootstrap
|
||||
endif
|
||||
fpmkunit_all: fcl-base_all fcl-process_all paszlib_all
|
||||
fpmkunit_debug: fcl-base_debug fcl-process_debug paszlib_debug
|
||||
fpmkunit_smart: fcl-base_smart fcl-process_smart paszlib_smart
|
||||
fpmkunit_release: fcl-base_release fcl-process_release paszlib_release
|
||||
fpmkunit_shared: fcl-base_shared fcl-process_shared paszlib_shared
|
||||
fpmkunit_all: fpmkunit_bootstrap fcl-base_all fcl-process_all paszlib_all
|
||||
fpmkunit_debug: fpmkunit_bootstrap fcl-base_debug fcl-process_debug paszlib_debug
|
||||
fpmkunit_smart: fpmkunit_bootstrap fcl-base_smart fcl-process_smart paszlib_smart
|
||||
fpmkunit_release: fpmkunit_bootstrap fcl-base_release fcl-process_release paszlib_release
|
||||
fpmkunit_shared: fpmkunit_bootstrap fcl-base_shared fcl-process_shared paszlib_shared
|
||||
|
||||
ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
|
||||
fcl-base_all: univint_all paszlib_all
|
||||
@ -198,17 +198,17 @@ fcl-net_release: fcl-passrc_release fcl-xml_release fcl-async_release
|
||||
fcl-net_shared: fcl-passrc_shared fcl-xml_shared fcl-async_shared
|
||||
endif
|
||||
|
||||
fcl-web_all: fpmkunit_bootstrap fcl-db_all fcl-xml_all fcl-process_all httpd22_all fastcgi_all fcl-net_all fcl-json_all
|
||||
fcl-web_debug: fpmkunit_bootstrap fcl-db_debug fcl-xml_debug fcl-process_debug httpd22_debug fastcgi_debug fcl-net_debug fcl-json_debug
|
||||
fcl-web_smart: fpmkunit_bootstrap fcl-db_smart fcl-xml_smart fcl-process_smart httpd22_smart fastcgi_smart fcl-net_smart fcl-json_smart
|
||||
fcl-web_release: fpmkunit_bootstrap fcl-db_release fcl-xml_release fcl-process_release httpd22_release fastcgi_release fcl-net_release fcl-json_release
|
||||
fcl-web_shared: fpmkunit_bootstrap fcl-db_shared fcl-xml_shared fcl-process_shared httpd22_shared fastcgi_shared fcl-net_shared fcl-json_shared
|
||||
fcl-web_all: fpmkunit_all fcl-db_all fcl-xml_all fcl-process_all httpd22_all fastcgi_all fcl-net_all fcl-json_all
|
||||
fcl-web_debug: fpmkunit_debug fcl-db_debug fcl-xml_debug fcl-process_debug httpd22_debug fastcgi_debug fcl-net_debug fcl-json_debug
|
||||
fcl-web_smart: fpmkunit_smart fcl-db_smart fcl-xml_smart fcl-process_smart httpd22_smart fastcgi_smart fcl-net_smart fcl-json_smart
|
||||
fcl-web_release: fpmkunit_release fcl-db_release fcl-xml_release fcl-process_release httpd22_release fastcgi_release fcl-net_release fcl-json_release
|
||||
fcl-web_shared: fpmkunit_shared fcl-db_shared fcl-xml_shared fcl-process_shared httpd22_shared fastcgi_shared fcl-net_shared fcl-json_shared
|
||||
|
||||
fastcgi_all: fpmkunit_bootstrap
|
||||
fastcgi_debug: fpmkunit_bootstrap
|
||||
fastcgi_smart: fpmkunit_bootstrap
|
||||
fastcgi_release: fpmkunit_bootstrap
|
||||
fastcgi_shared: fpmkunit_bootstrap
|
||||
fastcgi_all: fpmkunit_all
|
||||
fastcgi_debug: fpmkunit_debug
|
||||
fastcgi_smart: fpmkunit_smart
|
||||
fastcgi_release: fpmkunit_release
|
||||
fastcgi_shared: fpmkunit_shared
|
||||
|
||||
ifneq ($(findstring $(OS_TARGET),linux freebsd openbsd netbsd win32 beos haiku),)
|
||||
fcl-db_all: fcl-xml_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all pxlib_all
|
||||
|
||||
Loading…
Reference in New Issue
Block a user