From 73876b74903a71732e3a5d4b0ea9b89b6a4483db Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 3 Oct 2003 21:40:35 +0000 Subject: [PATCH] * CROSSCOMPILING stage 2 --- Makefile | 21 ++++++++---- Makefile.fpc | 5 +-- compiler/Makefile | 33 +++++++++++-------- compiler/Makefile.fpc | 16 ++++----- compiler/utils/Makefile | 17 +++++++--- demo/Makefile | 17 +++++++--- demo/graph/Makefile | 17 +++++++--- demo/linux/Makefile | 17 +++++++--- demo/modex/Makefile | 17 +++++++--- demo/os2/Makefile | 17 +++++++--- demo/text/Makefile | 17 +++++++--- demo/win32/Makefile | 17 +++++++--- fcl/Makefile | 17 +++++++--- fcl/db/Makefile | 17 +++++++--- fcl/db/dbase/Makefile | 17 +++++++--- fcl/db/interbase/Makefile | 17 +++++++--- fcl/db/mysql/Makefile | 17 +++++++--- fcl/db/odbc/Makefile | 17 +++++++--- fcl/db/tests/Makefile | 17 +++++++--- fcl/image/Makefile | 17 +++++++--- fcl/net/Makefile | 17 +++++++--- fcl/net/tests/Makefile | 17 +++++++--- fcl/passrc/Makefile | 17 +++++++--- fcl/shedit/Makefile | 17 +++++++--- fcl/shedit/gtk/Makefile | 17 +++++++--- fcl/tests/Makefile | 17 +++++++--- fcl/xml/Makefile | 17 +++++++--- ide/Makefile | 17 +++++++--- ide/compiler/Makefile | 17 +++++++--- ide/fakegdb/Makefile | 17 +++++++--- installer/Makefile | 17 +++++++--- packages/Makefile | 17 +++++++--- packages/base/Makefile | 17 +++++++--- packages/base/gdbint/Makefile | 17 +++++++--- packages/base/gdbint/libgdb/Makefile | 17 +++++++--- packages/base/ibase/Makefile | 17 +++++++--- packages/base/inet/Makefile | 17 +++++++--- packages/base/libasync/Makefile | 17 +++++++--- packages/base/libc/Makefile | 17 +++++++--- packages/base/md5/Makefile | 17 +++++++--- packages/base/mysql/Makefile | 17 +++++++--- packages/base/netdb/Makefile | 17 +++++++--- packages/base/odbc/Makefile | 17 +++++++--- packages/base/oracle/Makefile | 17 +++++++--- packages/base/oracle/example/Makefile | 17 +++++++--- packages/base/paszlib/Makefile | 17 +++++++--- packages/base/postgres/Makefile | 17 +++++++--- packages/base/pthreads/Makefile | 17 +++++++--- packages/base/regexpr/Makefile | 17 +++++++--- packages/base/sqlite/Makefile | 17 +++++++--- packages/extra/Makefile | 17 +++++++--- packages/extra/bfd/Makefile | 17 +++++++--- packages/extra/cdrom/Makefile | 17 +++++++--- packages/extra/cmem/Makefile | 17 +++++++--- packages/extra/forms/Makefile | 17 +++++++--- packages/extra/forms/demo/Makefile | 17 +++++++--- packages/extra/fpgtk/Makefile | 17 +++++++--- packages/extra/fpgtk/demo/Makefile | 17 +++++++--- packages/extra/gdbm/Makefile | 17 +++++++--- packages/extra/ggi/Makefile | 17 +++++++--- packages/extra/gnome1/Makefile | 17 +++++++--- packages/extra/gnome1/gconf/Makefile | 17 +++++++--- packages/extra/gnome1/gconf/examples/Makefile | 17 +++++++--- packages/extra/gnome1/gnome/Makefile | 17 +++++++--- packages/extra/gnome1/zvt/Makefile | 17 +++++++--- packages/extra/gnome1/zvt/examples/Makefile | 17 +++++++--- packages/extra/gtk/Makefile | 17 +++++++--- packages/extra/gtk/examples/Makefile | 17 +++++++--- packages/extra/gtk/examples/tutorial/Makefile | 17 +++++++--- packages/extra/gtk/gtkgl/Makefile | 17 +++++++--- packages/extra/imlib/Makefile | 17 +++++++--- packages/extra/libgd/Makefile | 17 +++++++--- packages/extra/libpng/Makefile | 17 +++++++--- packages/extra/mmsystem/Makefile | 17 +++++++--- packages/extra/ncurses/Makefile | 17 +++++++--- packages/extra/numlib/Makefile | 17 +++++++--- packages/extra/opengl/Makefile | 17 +++++++--- packages/extra/opengl/examples/Makefile | 17 +++++++--- packages/extra/os2units/Makefile | 17 +++++++--- packages/extra/os2units/ftpapi/Makefile | 17 +++++++--- packages/extra/os2units/hwvideo/Makefile | 17 +++++++--- packages/extra/os2units/lvm/Makefile | 17 +++++++--- packages/extra/os2units/lvm/tests/Makefile | 17 +++++++--- packages/extra/os2units/mmtk/Makefile | 17 +++++++--- packages/extra/os2units/mmtk/tests/Makefile | 17 +++++++--- packages/extra/rexx/Makefile | 17 +++++++--- packages/extra/rexx/test/Makefile | 17 +++++++--- packages/extra/sndfile/Makefile | 17 +++++++--- packages/extra/svgalib/Makefile | 17 +++++++--- packages/extra/syslog/Makefile | 17 +++++++--- packages/extra/tcl/Makefile | 17 +++++++--- packages/extra/uncgi/Makefile | 17 +++++++--- packages/extra/unixutil/Makefile | 17 +++++++--- packages/extra/unzip/Makefile | 17 +++++++--- packages/extra/utmp/Makefile | 17 +++++++--- packages/extra/winver/Makefile | 17 +++++++--- packages/extra/x11/Makefile | 17 +++++++--- packages/extra/zlib/Makefile | 17 +++++++--- rtl/Makefile | 17 +++++++--- rtl/amiga/Makefile | 17 +++++++--- rtl/beos/Makefile | 17 +++++++--- rtl/darwin/Makefile | 17 +++++++--- rtl/emx/Makefile | 17 +++++++--- rtl/freebsd/Makefile | 17 +++++++--- rtl/go32v2/Makefile | 17 +++++++--- rtl/linux/Makefile | 17 +++++++--- rtl/macos/Makefile | 17 +++++++--- rtl/netbsd/Makefile | 17 +++++++--- rtl/netware/Makefile | 17 +++++++--- rtl/os2/Makefile | 17 +++++++--- rtl/win32/Makefile | 17 +++++++--- tests/Makefile | 17 +++++++--- tests/units/Makefile | 17 +++++++--- 113 files changed, 1353 insertions(+), 575 deletions(-) diff --git a/Makefile b/Makefile index c4fbc6d535..0fa0d633f0 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: help MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -223,10 +223,10 @@ ifeq ($(CPU_TARGET),alpha) PPSUF=axp endif ifneq ($(OS_TARGET),$(OS_SOURCE)) -PPPRE=ppcross +PPPRE=ppcross$(CPU_TARGET) else ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -PPPRE=ppcross +PPPRE=ppcross$(CPU_TARGET) else PPPRE=ppc endif @@ -917,15 +917,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1168,6 +1170,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/Makefile.fpc b/Makefile.fpc index 95b703a670..c2acdb06fb 100644 --- a/Makefile.fpc +++ b/Makefile.fpc @@ -38,11 +38,12 @@ ifeq ($(CPU_TARGET),alpha) PPSUF=axp endif + ifneq ($(OS_TARGET),$(OS_SOURCE)) -PPPRE=ppcross +PPPRE=ppcross$(CPU_TARGET) else ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -PPPRE=ppcross +PPPRE=ppcross$(CPU_TARGET) else PPPRE=ppc endif diff --git a/compiler/Makefile b/compiler/Makefile index b0dc5e9cd4..0b17de782c 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -907,15 +907,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1158,6 +1160,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1792,19 +1799,19 @@ cycle: $(MAKE) echotime else cycle: - $(MAKE) OS_TARGET=$(OS_SOURCE) rtlclean rtl - $(MAKE) OS_TARGET=$(OS_SOURCE) EXENAME=$(TEMPNAME) clean compiler - $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) rtlclean rtl - $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) EXENAME=$(PPCROSSNAME) clean compiler + $(MAKE) OS_TARGET=$(OS_SOURCE) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 rtlclean rtl + $(MAKE) OS_TARGET=$(OS_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 clean compiler + $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 rtlclean rtl + $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) EXENAME=$(PPCROSSNAME) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 clean compiler $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' clean compiler endif else cycle: - $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) rtlclean rtl - $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) clean compiler - $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) rtlclean rtl - $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) PPC_TARGET=$(CPU_TARGET) EXENAME=$(PPCROSSNAME) clean compiler + $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 rtlclean rtl + $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 clean compiler + $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 rtlclean rtl + $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) PPC_TARGET=$(CPU_TARGET) EXENAME=$(PPCROSSNAME) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 clean compiler $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' clean compiler endif diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc index 5ce40ac534..dcff69ea96 100644 --- a/compiler/Makefile.fpc +++ b/compiler/Makefile.fpc @@ -445,11 +445,11 @@ else cycle: # ppc (source native) - $(MAKE) OS_TARGET=$(OS_SOURCE) rtlclean rtl - $(MAKE) OS_TARGET=$(OS_SOURCE) EXENAME=$(TEMPNAME) clean compiler + $(MAKE) OS_TARGET=$(OS_SOURCE) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 rtlclean rtl + $(MAKE) OS_TARGET=$(OS_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 clean compiler # ppcross (source native) - $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) rtlclean rtl - $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) EXENAME=$(PPCROSSNAME) clean compiler + $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 rtlclean rtl + $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) EXENAME=$(PPCROSSNAME) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 clean compiler # ppc (target native) $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' clean compiler @@ -468,11 +468,11 @@ else cycle: # ppc (source native) - $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) rtlclean rtl - $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) clean compiler + $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 rtlclean rtl + $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 clean compiler # ppcross (source native) - $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) rtlclean rtl - $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) PPC_TARGET=$(CPU_TARGET) EXENAME=$(PPCROSSNAME) clean compiler + $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 rtlclean rtl + $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) PPC_TARGET=$(CPU_TARGET) EXENAME=$(PPCROSSNAME) CROSSBINDIR="" BINUTILSPREFIX="" CROSSCYCLEBOOTSTRAP=1 clean compiler # ppc (target native) $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' clean compiler diff --git a/compiler/utils/Makefile b/compiler/utils/Makefile index ab1a99a190..ea94d54dac 100644 --- a/compiler/utils/Makefile +++ b/compiler/utils/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -796,15 +796,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1047,6 +1049,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/demo/Makefile b/demo/Makefile index 18dba3a006..e95e5a1101 100644 --- a/demo/Makefile +++ b/demo/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -806,15 +806,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1057,6 +1059,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/demo/graph/Makefile b/demo/graph/Makefile index ac52fcd4d1..09e1addaed 100644 --- a/demo/graph/Makefile +++ b/demo/graph/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/demo/linux/Makefile b/demo/linux/Makefile index 6b0bd72155..23ff74bf47 100644 --- a/demo/linux/Makefile +++ b/demo/linux/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -799,15 +799,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1050,6 +1052,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/demo/modex/Makefile b/demo/modex/Makefile index 21d8188661..218e2fda7d 100644 --- a/demo/modex/Makefile +++ b/demo/modex/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -793,15 +793,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1044,6 +1046,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/demo/os2/Makefile b/demo/os2/Makefile index 4880d37ace..bc37390d68 100644 --- a/demo/os2/Makefile +++ b/demo/os2/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -793,15 +793,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1044,6 +1046,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/demo/text/Makefile b/demo/text/Makefile index 04ab8c4183..50441b65b3 100644 --- a/demo/text/Makefile +++ b/demo/text/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -791,15 +791,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1042,6 +1044,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/demo/win32/Makefile b/demo/win32/Makefile index c22714b78e..3a86e66855 100644 --- a/demo/win32/Makefile +++ b/demo/win32/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -793,15 +793,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1044,6 +1046,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/Makefile b/fcl/Makefile index 8d4280bb66..8382431745 100644 --- a/fcl/Makefile +++ b/fcl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -855,15 +855,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1372,6 +1374,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/db/Makefile b/fcl/db/Makefile index dd28b52ff4..6730d5c0c0 100644 --- a/fcl/db/Makefile +++ b/fcl/db/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -826,15 +826,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1153,6 +1155,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/db/dbase/Makefile b/fcl/db/dbase/Makefile index 0a7f1541eb..4ec4b9c0e7 100644 --- a/fcl/db/dbase/Makefile +++ b/fcl/db/dbase/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -796,15 +796,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1047,6 +1049,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/db/interbase/Makefile b/fcl/db/interbase/Makefile index bf5226dec5..ce44be429c 100644 --- a/fcl/db/interbase/Makefile +++ b/fcl/db/interbase/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -811,15 +811,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1115,6 +1117,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/db/mysql/Makefile b/fcl/db/mysql/Makefile index 39cf42babd..eee5eb454c 100644 --- a/fcl/db/mysql/Makefile +++ b/fcl/db/mysql/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -812,15 +812,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1116,6 +1118,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/db/odbc/Makefile b/fcl/db/odbc/Makefile index 17e6289e4b..d9286f8e28 100644 --- a/fcl/db/odbc/Makefile +++ b/fcl/db/odbc/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -810,15 +810,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1114,6 +1116,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/db/tests/Makefile b/fcl/db/tests/Makefile index 5e11b95de2..770d5e39b6 100644 --- a/fcl/db/tests/Makefile +++ b/fcl/db/tests/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -807,15 +807,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1377,6 +1379,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/image/Makefile b/fcl/image/Makefile index 8fcc35e304..1de9a8410f 100644 --- a/fcl/image/Makefile +++ b/fcl/image/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -796,15 +796,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1100,6 +1102,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/net/Makefile b/fcl/net/Makefile index 185e9f978d..2d69fb3d58 100644 --- a/fcl/net/Makefile +++ b/fcl/net/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -843,15 +843,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1200,6 +1202,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/net/tests/Makefile b/fcl/net/tests/Makefile index fd4e7083cc..f9a5cf1743 100644 --- a/fcl/net/tests/Makefile +++ b/fcl/net/tests/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -808,15 +808,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1378,6 +1380,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/passrc/Makefile b/fcl/passrc/Makefile index d4ca32e55c..073694cf21 100644 --- a/fcl/passrc/Makefile +++ b/fcl/passrc/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -796,15 +796,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1047,6 +1049,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/shedit/Makefile b/fcl/shedit/Makefile index 9c9f2566a8..63e8d40041 100644 --- a/fcl/shedit/Makefile +++ b/fcl/shedit/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -796,15 +796,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1047,6 +1049,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/shedit/gtk/Makefile b/fcl/shedit/gtk/Makefile index 4188eec939..0087af23ff 100644 --- a/fcl/shedit/gtk/Makefile +++ b/fcl/shedit/gtk/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -807,15 +807,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1520,6 +1522,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/tests/Makefile b/fcl/tests/Makefile index 5d9be88677..644ff5d5c1 100644 --- a/fcl/tests/Makefile +++ b/fcl/tests/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -813,15 +813,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1383,6 +1385,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/fcl/xml/Makefile b/fcl/xml/Makefile index 05281b2516..dbd542d3ae 100644 --- a/fcl/xml/Makefile +++ b/fcl/xml/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -796,15 +796,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1047,6 +1049,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/ide/Makefile b/ide/Makefile index 08ba53b461..b76729c75e 100644 --- a/ide/Makefile +++ b/ide/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -859,15 +859,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1269,6 +1271,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/ide/compiler/Makefile b/ide/compiler/Makefile index 5b518b8482..acea6f578f 100644 --- a/ide/compiler/Makefile +++ b/ide/compiler/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -807,15 +807,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1058,6 +1060,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/ide/fakegdb/Makefile b/ide/fakegdb/Makefile index d2d2a46160..efd43a6c13 100644 --- a/ide/fakegdb/Makefile +++ b/ide/fakegdb/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -792,15 +792,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1043,6 +1045,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/installer/Makefile b/installer/Makefile index f924e84a92..e0f1fab55a 100644 --- a/installer/Makefile +++ b/installer/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -810,15 +810,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1167,6 +1169,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/Makefile b/packages/Makefile index 9a4eb312f3..13eb95edfc 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -793,15 +793,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1044,6 +1046,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/Makefile b/packages/base/Makefile index d39ec21cdb..70c3dc8d33 100644 --- a/packages/base/Makefile +++ b/packages/base/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -811,15 +811,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1062,6 +1064,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/gdbint/Makefile b/packages/base/gdbint/Makefile index a762375400..8fdc1a7adb 100644 --- a/packages/base/gdbint/Makefile +++ b/packages/base/gdbint/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -833,15 +833,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1084,6 +1086,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/gdbint/libgdb/Makefile b/packages/base/gdbint/libgdb/Makefile index 63b98ddbea..b320eed259 100644 --- a/packages/base/gdbint/libgdb/Makefile +++ b/packages/base/gdbint/libgdb/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -790,15 +790,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1041,6 +1043,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/ibase/Makefile b/packages/base/ibase/Makefile index 5e8f63a533..c0ce58028b 100644 --- a/packages/base/ibase/Makefile +++ b/packages/base/ibase/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1060,6 +1062,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/inet/Makefile b/packages/base/inet/Makefile index 5d2936e0fa..aa3e34c8fd 100644 --- a/packages/base/inet/Makefile +++ b/packages/base/inet/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/libasync/Makefile b/packages/base/libasync/Makefile index 720041f789..3dce2422ab 100644 --- a/packages/base/libasync/Makefile +++ b/packages/base/libasync/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -807,15 +807,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1058,6 +1060,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/libc/Makefile b/packages/base/libc/Makefile index 6a009aaada..bbf420d506 100644 --- a/packages/base/libc/Makefile +++ b/packages/base/libc/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -808,15 +808,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1059,6 +1061,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/md5/Makefile b/packages/base/md5/Makefile index 94d07169d1..22bfd662ae 100644 --- a/packages/base/md5/Makefile +++ b/packages/base/md5/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/mysql/Makefile b/packages/base/mysql/Makefile index 08a48f0456..eafe282b2f 100644 --- a/packages/base/mysql/Makefile +++ b/packages/base/mysql/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1060,6 +1062,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/netdb/Makefile b/packages/base/netdb/Makefile index 615bd286dc..5f871fc709 100644 --- a/packages/base/netdb/Makefile +++ b/packages/base/netdb/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -819,15 +819,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1070,6 +1072,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/odbc/Makefile b/packages/base/odbc/Makefile index 8d445d1aad..c2b2633886 100644 --- a/packages/base/odbc/Makefile +++ b/packages/base/odbc/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1060,6 +1062,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/oracle/Makefile b/packages/base/oracle/Makefile index ecfc79ee2a..899a8816b0 100644 --- a/packages/base/oracle/Makefile +++ b/packages/base/oracle/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1060,6 +1062,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/oracle/example/Makefile b/packages/base/oracle/example/Makefile index 737cacd00e..30baeadec9 100644 --- a/packages/base/oracle/example/Makefile +++ b/packages/base/oracle/example/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -807,15 +807,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1430,6 +1432,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/paszlib/Makefile b/packages/base/paszlib/Makefile index b4081a016c..98080e3627 100644 --- a/packages/base/paszlib/Makefile +++ b/packages/base/paszlib/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/postgres/Makefile b/packages/base/postgres/Makefile index 2f802f58a5..932eb6e865 100644 --- a/packages/base/postgres/Makefile +++ b/packages/base/postgres/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1060,6 +1062,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/pthreads/Makefile b/packages/base/pthreads/Makefile index 12fff18a37..70ed914e0c 100644 --- a/packages/base/pthreads/Makefile +++ b/packages/base/pthreads/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -794,15 +794,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1045,6 +1047,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/regexpr/Makefile b/packages/base/regexpr/Makefile index 0db73058d6..47c4497920 100644 --- a/packages/base/regexpr/Makefile +++ b/packages/base/regexpr/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -796,15 +796,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1047,6 +1049,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/base/sqlite/Makefile b/packages/base/sqlite/Makefile index 0e1080e709..7c9bb1e155 100644 --- a/packages/base/sqlite/Makefile +++ b/packages/base/sqlite/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -794,15 +794,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1045,6 +1047,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/Makefile b/packages/extra/Makefile index bfd7d0b78e..fe91fa2b5e 100644 --- a/packages/extra/Makefile +++ b/packages/extra/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -820,15 +820,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1071,6 +1073,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/bfd/Makefile b/packages/extra/bfd/Makefile index b1c2b879d6..f95c6d861d 100644 --- a/packages/extra/bfd/Makefile +++ b/packages/extra/bfd/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -794,15 +794,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1045,6 +1047,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/cdrom/Makefile b/packages/extra/cdrom/Makefile index c26f1199b1..295c28ea0f 100644 --- a/packages/extra/cdrom/Makefile +++ b/packages/extra/cdrom/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -801,15 +801,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1052,6 +1054,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/cmem/Makefile b/packages/extra/cmem/Makefile index 83d2d464a9..a0ad05191c 100644 --- a/packages/extra/cmem/Makefile +++ b/packages/extra/cmem/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/forms/Makefile b/packages/extra/forms/Makefile index 48c0aa88ec..c78418b102 100644 --- a/packages/extra/forms/Makefile +++ b/packages/extra/forms/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -810,15 +810,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1114,6 +1116,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/forms/demo/Makefile b/packages/extra/forms/demo/Makefile index dec0d25df6..2dd2fdd494 100644 --- a/packages/extra/forms/demo/Makefile +++ b/packages/extra/forms/demo/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -806,15 +806,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1163,6 +1165,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/fpgtk/Makefile b/packages/extra/fpgtk/Makefile index 98cea26a53..45e8a7e5bd 100644 --- a/packages/extra/fpgtk/Makefile +++ b/packages/extra/fpgtk/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1522,6 +1524,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/fpgtk/demo/Makefile b/packages/extra/fpgtk/demo/Makefile index 1583f72faa..d2b7d85122 100644 --- a/packages/extra/fpgtk/demo/Makefile +++ b/packages/extra/fpgtk/demo/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -807,15 +807,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1573,6 +1575,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/gdbm/Makefile b/packages/extra/gdbm/Makefile index e80f2a01a2..050db6e8d3 100644 --- a/packages/extra/gdbm/Makefile +++ b/packages/extra/gdbm/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/ggi/Makefile b/packages/extra/ggi/Makefile index 55756b8421..820644a6bc 100644 --- a/packages/extra/ggi/Makefile +++ b/packages/extra/ggi/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1060,6 +1062,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/gnome1/Makefile b/packages/extra/gnome1/Makefile index 18bd83135a..8860c56f9f 100644 --- a/packages/extra/gnome1/Makefile +++ b/packages/extra/gnome1/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -793,15 +793,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1044,6 +1046,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/gnome1/gconf/Makefile b/packages/extra/gnome1/gconf/Makefile index f76fcc46d3..9ba9d6268c 100644 --- a/packages/extra/gnome1/gconf/Makefile +++ b/packages/extra/gnome1/gconf/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -811,15 +811,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1205,6 +1207,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/gnome1/gconf/examples/Makefile b/packages/extra/gnome1/gconf/examples/Makefile index a6d88a1044..d028400fed 100644 --- a/packages/extra/gnome1/gconf/examples/Makefile +++ b/packages/extra/gnome1/gconf/examples/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -807,15 +807,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1254,6 +1256,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/gnome1/gnome/Makefile b/packages/extra/gnome1/gnome/Makefile index 3246a20e6e..28c540e39b 100644 --- a/packages/extra/gnome1/gnome/Makefile +++ b/packages/extra/gnome1/gnome/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -810,15 +810,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1273,6 +1275,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/gnome1/zvt/Makefile b/packages/extra/gnome1/zvt/Makefile index e3cfe557e2..ef699723fc 100644 --- a/packages/extra/gnome1/zvt/Makefile +++ b/packages/extra/gnome1/zvt/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -811,15 +811,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1274,6 +1276,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/gnome1/zvt/examples/Makefile b/packages/extra/gnome1/zvt/examples/Makefile index 59faae4739..bcf4a04539 100644 --- a/packages/extra/gnome1/zvt/examples/Makefile +++ b/packages/extra/gnome1/zvt/examples/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -807,15 +807,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1376,6 +1378,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/gtk/Makefile b/packages/extra/gtk/Makefile index 6409fe3bae..8c89f87a10 100644 --- a/packages/extra/gtk/Makefile +++ b/packages/extra/gtk/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -812,15 +812,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1153,6 +1155,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/gtk/examples/Makefile b/packages/extra/gtk/examples/Makefile index 036a3dd454..e06c235643 100644 --- a/packages/extra/gtk/examples/Makefile +++ b/packages/extra/gtk/examples/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -808,15 +808,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1202,6 +1204,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/gtk/examples/tutorial/Makefile b/packages/extra/gtk/examples/tutorial/Makefile index a6d94ffa7c..32bba8e21e 100644 --- a/packages/extra/gtk/examples/tutorial/Makefile +++ b/packages/extra/gtk/examples/tutorial/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -805,15 +805,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1199,6 +1201,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/gtk/gtkgl/Makefile b/packages/extra/gtk/gtkgl/Makefile index cda933939f..2a3465ef6f 100644 --- a/packages/extra/gtk/gtkgl/Makefile +++ b/packages/extra/gtk/gtkgl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1150,6 +1152,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/imlib/Makefile b/packages/extra/imlib/Makefile index bd8e9fdbed..b382b39eac 100644 --- a/packages/extra/imlib/Makefile +++ b/packages/extra/imlib/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -811,15 +811,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1221,6 +1223,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/libgd/Makefile b/packages/extra/libgd/Makefile index 4b8ced45a1..f5035f95fc 100644 --- a/packages/extra/libgd/Makefile +++ b/packages/extra/libgd/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1060,6 +1062,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/libpng/Makefile b/packages/extra/libpng/Makefile index 44f80689d4..7ce6b1706a 100644 --- a/packages/extra/libpng/Makefile +++ b/packages/extra/libpng/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -808,15 +808,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1112,6 +1114,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/mmsystem/Makefile b/packages/extra/mmsystem/Makefile index 85de675b77..e8a8318cb8 100644 --- a/packages/extra/mmsystem/Makefile +++ b/packages/extra/mmsystem/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -794,15 +794,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1045,6 +1047,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/ncurses/Makefile b/packages/extra/ncurses/Makefile index c139497c2c..ca95b97f60 100644 --- a/packages/extra/ncurses/Makefile +++ b/packages/extra/ncurses/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1060,6 +1062,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/numlib/Makefile b/packages/extra/numlib/Makefile index c7abab9c6e..32917c0426 100644 --- a/packages/extra/numlib/Makefile +++ b/packages/extra/numlib/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -794,15 +794,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1045,6 +1047,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/opengl/Makefile b/packages/extra/opengl/Makefile index 540df0a842..a30e43af86 100644 --- a/packages/extra/opengl/Makefile +++ b/packages/extra/opengl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -821,15 +821,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1109,6 +1111,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/opengl/examples/Makefile b/packages/extra/opengl/examples/Makefile index 2546326cca..945b5ebfe0 100644 --- a/packages/extra/opengl/examples/Makefile +++ b/packages/extra/opengl/examples/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -807,15 +807,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1148,6 +1150,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/os2units/Makefile b/packages/extra/os2units/Makefile index c8cf79912a..d4bee839ae 100644 --- a/packages/extra/os2units/Makefile +++ b/packages/extra/os2units/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -793,15 +793,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1044,6 +1046,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/os2units/ftpapi/Makefile b/packages/extra/os2units/ftpapi/Makefile index 2403971212..96c573b41e 100644 --- a/packages/extra/os2units/ftpapi/Makefile +++ b/packages/extra/os2units/ftpapi/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/os2units/hwvideo/Makefile b/packages/extra/os2units/hwvideo/Makefile index 1e099f599a..3753defd6f 100644 --- a/packages/extra/os2units/hwvideo/Makefile +++ b/packages/extra/os2units/hwvideo/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -794,15 +794,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1045,6 +1047,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/os2units/lvm/Makefile b/packages/extra/os2units/lvm/Makefile index 958c020182..2a4a90056b 100644 --- a/packages/extra/os2units/lvm/Makefile +++ b/packages/extra/os2units/lvm/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/os2units/lvm/tests/Makefile b/packages/extra/os2units/lvm/tests/Makefile index 08343f42a0..af7b5a586e 100644 --- a/packages/extra/os2units/lvm/tests/Makefile +++ b/packages/extra/os2units/lvm/tests/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -792,15 +792,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1043,6 +1045,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/os2units/mmtk/Makefile b/packages/extra/os2units/mmtk/Makefile index 0595a9adc8..26406fffd7 100644 --- a/packages/extra/os2units/mmtk/Makefile +++ b/packages/extra/os2units/mmtk/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/os2units/mmtk/tests/Makefile b/packages/extra/os2units/mmtk/tests/Makefile index 1e3a3c4d29..8d53de03fb 100644 --- a/packages/extra/os2units/mmtk/tests/Makefile +++ b/packages/extra/os2units/mmtk/tests/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -792,15 +792,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1043,6 +1045,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/rexx/Makefile b/packages/extra/rexx/Makefile index 274e9c2107..389a430ff0 100644 --- a/packages/extra/rexx/Makefile +++ b/packages/extra/rexx/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/rexx/test/Makefile b/packages/extra/rexx/test/Makefile index 0a95bc8025..f8f235af27 100644 --- a/packages/extra/rexx/test/Makefile +++ b/packages/extra/rexx/test/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -792,15 +792,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1096,6 +1098,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/sndfile/Makefile b/packages/extra/sndfile/Makefile index dafa8a2405..2e12d13415 100644 --- a/packages/extra/sndfile/Makefile +++ b/packages/extra/sndfile/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -810,15 +810,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1061,6 +1063,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/svgalib/Makefile b/packages/extra/svgalib/Makefile index 75f4d8903f..44171d3eb1 100644 --- a/packages/extra/svgalib/Makefile +++ b/packages/extra/svgalib/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1060,6 +1062,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/syslog/Makefile b/packages/extra/syslog/Makefile index c2f52f6a33..49f1aa346c 100644 --- a/packages/extra/syslog/Makefile +++ b/packages/extra/syslog/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1060,6 +1062,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/tcl/Makefile b/packages/extra/tcl/Makefile index 051d43c2a5..0b80d40ab6 100644 --- a/packages/extra/tcl/Makefile +++ b/packages/extra/tcl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1379,6 +1381,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/uncgi/Makefile b/packages/extra/uncgi/Makefile index 700d0476b6..4d6d976a2c 100644 --- a/packages/extra/uncgi/Makefile +++ b/packages/extra/uncgi/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/unixutil/Makefile b/packages/extra/unixutil/Makefile index 8d9874a0c3..fb57accf6d 100644 --- a/packages/extra/unixutil/Makefile +++ b/packages/extra/unixutil/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -809,15 +809,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1432,6 +1434,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/unzip/Makefile b/packages/extra/unzip/Makefile index 2f6ea4a8ca..604506d812 100644 --- a/packages/extra/unzip/Makefile +++ b/packages/extra/unzip/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -797,15 +797,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1048,6 +1050,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/utmp/Makefile b/packages/extra/utmp/Makefile index a05b726426..4885e8ff6e 100644 --- a/packages/extra/utmp/Makefile +++ b/packages/extra/utmp/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/winver/Makefile b/packages/extra/winver/Makefile index 3a712936e4..8ff020437c 100644 --- a/packages/extra/winver/Makefile +++ b/packages/extra/winver/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -795,15 +795,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1046,6 +1048,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/x11/Makefile b/packages/extra/x11/Makefile index 72d73bf978..4346f9c03b 100644 --- a/packages/extra/x11/Makefile +++ b/packages/extra/x11/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -808,15 +808,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1059,6 +1061,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/packages/extra/zlib/Makefile b/packages/extra/zlib/Makefile index 5e2265b2c5..fc780bceb7 100644 --- a/packages/extra/zlib/Makefile +++ b/packages/extra/zlib/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -808,15 +808,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1059,6 +1061,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/Makefile b/rtl/Makefile index 78ed62b84b..c9f14be614 100644 --- a/rtl/Makefile +++ b/rtl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -818,15 +818,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1069,6 +1071,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile index 091c2b77e2..c98c4dc264 100644 --- a/rtl/amiga/Makefile +++ b/rtl/amiga/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -815,15 +815,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -904,6 +906,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile index 83de7c0bab..5357544c38 100644 --- a/rtl/beos/Makefile +++ b/rtl/beos/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -810,15 +810,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -899,6 +901,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile index 6ac82030e0..7735ac8242 100644 --- a/rtl/darwin/Makefile +++ b/rtl/darwin/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -824,15 +824,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -913,6 +915,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile index 688e44f62b..14e93909b2 100644 --- a/rtl/emx/Makefile +++ b/rtl/emx/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -815,15 +815,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -904,6 +906,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile index 077cf937a5..f474df5d0c 100644 --- a/rtl/freebsd/Makefile +++ b/rtl/freebsd/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -824,15 +824,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -913,6 +915,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index 6033db0936..1195672157 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -815,15 +815,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -904,6 +906,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index d16d730c4f..b4d13a2a97 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -830,15 +830,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -919,6 +921,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile index dc6e83cf02..c19506014b 100644 --- a/rtl/macos/Makefile +++ b/rtl/macos/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -812,15 +812,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -901,6 +903,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile index 390980af2c..8cf0173198 100644 --- a/rtl/netbsd/Makefile +++ b/rtl/netbsd/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -829,15 +829,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -918,6 +920,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile index 9f785353b4..8b157c0ff6 100644 --- a/rtl/netware/Makefile +++ b/rtl/netware/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -812,15 +812,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -901,6 +903,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index c2da64086e..2b525eecc7 100644 --- a/rtl/os2/Makefile +++ b/rtl/os2/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -814,15 +814,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -903,6 +905,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index fe0c9ee3b7..6467663645 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -819,15 +819,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -908,6 +910,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/tests/Makefile b/tests/Makefile index af81ededb8..c9940d5d4e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: allexectests MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -805,15 +805,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1088,6 +1090,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif diff --git a/tests/units/Makefile b/tests/units/Makefile index 7d247ac3d8..9d8c8d7295 100644 --- a/tests/units/Makefile +++ b/tests/units/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/02] +# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -792,15 +792,17 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1043,6 +1045,11 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif