|
@@ -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/09]
|
|
|
#
|
|
|
default: all
|
|
|
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
|
|
@@ -100,7 +100,7 @@ ifndef FPC
|
|
|
FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
|
|
|
ifneq ($(FPCPROG),)
|
|
|
FPCPROG:=$(firstword $(FPCPROG))
|
|
|
-FPC:=$(shell $(FPCPROG) -QB)
|
|
|
+FPC:=$(shell $(FPCPROG) -PB)
|
|
|
ifneq ($(findstring Error,$(FPC)),)
|
|
|
override FPC=ppc386
|
|
|
endif
|
|
@@ -816,15 +816,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)
|
|
@@ -1067,6 +1069,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
|