* When using a installed compiler to compile fpmake, do not pass -n to

the compiler. Bug #19412.

git-svn-id: trunk@17605 -
This commit is contained in:
joost 2011-05-29 19:58:21 +00:00
parent c7d9525a2f
commit 898a4debca
6 changed files with 2527 additions and 2466 deletions

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/19]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/28]
#
default: help
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@ -282,11 +282,15 @@ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
FPCFPMAKE:=$(FPCNATIVE)
else
FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
FPMAKE_SKIP_CONFIG=-n
export FPCFPMAKE
export FPMAKE_SKIP_CONFIG
endif
else
FPCFPMAKE=$(FPC)
FPMAKE_SKIP_CONFIG=-n
export FPCFPMAKE
export FPMAKE_SKIP_CONFIG
endif
endif
override PACKAGE_NAME=fpc

View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/02/24]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/28]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx haiku
LIMIT83fs = go32v2 os2 emx watcom
@ -107,25 +107,37 @@ FPC=$(PP)
endif
endif
ifndef FPC
DETERMINE_NATIVE_COMPILER=1
else
ifdef CROSSCOMPILE
ifndef FPCFPMAKE
DETERMINE_NATIVE_COMPILER=1
endif
endif
endif
ifdef DETERMINE_NATIVE_COMPILER
FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
ifneq ($(FPCPROG),)
FPCPROG:=$(firstword $(FPCPROG))
ifneq ($(CPU_TARGET),)
FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
else
FPC:=$(shell $(FPCPROG) -PB)
FPCNATIVE:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
ifneq ($(findstring Error,$(FPCNATIVE)),)
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
else
ifeq ($(strip $(wildcard $(FPC))),)
FPC:=$(firstword $(FPCPROG))
ifeq ($(strip $(wildcard $(FPCNATIVE))),)
FPCNATIVE:=$(firstword $(FPCPROG))
endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
endif
endif
ifndef FPC
FPC=$(FPCNATIVE)
endif
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
FOUNDFPC:=$(strip $(wildcard $(FPC)))
@ -264,6 +276,23 @@ ifeq ($(UNITSDIR),)
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
ifndef FPCFPMAKE
ifdef CROSSCOMPILE
ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
FPCFPMAKE:=$(FPCNATIVE)
else
FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
FPMAKE_SKIP_CONFIG=-n
export FPCFPMAKE
export FPMAKE_SKIP_CONFIG
endif
else
FPCFPMAKE=$(FPC)
FPMAKE_SKIP_CONFIG=-n
export FPCFPMAKE
export FPMAKE_SKIP_CONFIG
endif
endif
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-js fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2 hermes fppkg fv fcl-web fastcgi fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid ldap modplug dts mad gdbm tcl syslog libcurl opengl opencl cairo gtk1 gtk2 librsvg a52 bfd aspell svgalib newt cdrom users iconvenc libxml proj4 fcl-extra zorba imlib utmp fpgtk openal lua oggvorbis xforms fftw pcap ggi sdl openssl gnome1 httpd22 pxlib numlib gmp libsee ptc graph libc unixutil graph pxlib bzip2
endif
@ -375,6 +404,9 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-js fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2 hermes fppkg
endif
ifeq ($(FULL_TARGET),powerpc-wii)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-js fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2 hermes fppkg libogcfpc
endif
ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-js fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2 hermes fppkg fv fcl-web fastcgi fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid ldap modplug dts mad gdbm tcl syslog libcurl opengl opencl cairo gtk1 gtk2 librsvg a52 bfd aspell svgalib newt cdrom users iconvenc libxml proj4 fcl-extra zorba imlib utmp fpgtk openal lua oggvorbis xforms fftw pcap ggi sdl openssl gnome1 httpd22 pxlib numlib gmp libsee ptc graph
endif
@ -798,6 +830,11 @@ ifeq ($(OS_TARGET),NativeNT)
SHAREDLIBEXT=.dll
SHORTSUFFIX=nativent
endif
ifeq ($(OS_TARGET),wii)
EXEEXT=.dol
SHAREDLIBEXT=.so
SHORTSUFFIX=wii
endif
else
ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1
@ -1471,6 +1508,7 @@ fpc_baseinfo:
@$(ECHO) Full Target.. $(FULL_TARGET)
@$(ECHO) SourceSuffix. $(SOURCESUFFIX)
@$(ECHO) TargetSuffix. $(TARGETSUFFIX)
@$(ECHO) FPC fpmake... $(FPCFPMAKE)
@$(ECHO)
@$(ECHO) == Directory info ==
@$(ECHO)
@ -3381,6 +3419,33 @@ TARGET_DIRS_BZIP2=1
TARGET_DIRS_HERMES=1
TARGET_DIRS_FPPKG=1
endif
ifeq ($(FULL_TARGET),powerpc-wii)
TARGET_DIRS_HASH=1
TARGET_DIRS_PASJPEG=1
TARGET_DIRS_PASZLIB=1
TARGET_DIRS_FPMKUNIT=1
TARGET_DIRS_FCL-XML=1
TARGET_DIRS_FCL-BASE=1
TARGET_DIRS_FCL-DB=1
TARGET_DIRS_FCL-IMAGE=1
TARGET_DIRS_FCL-NET=1
TARGET_DIRS_FCL-PASSRC=1
TARGET_DIRS_FCL-REGISTRY=1
TARGET_DIRS_FCL-FPCUNIT=1
TARGET_DIRS_FCL-JSON=1
TARGET_DIRS_FCL-JS=1
TARGET_DIRS_FCL-PROCESS=1
TARGET_DIRS_UNZIP=1
TARGET_DIRS_REGEXPR=1
TARGET_DIRS_CHM=1
TARGET_DIRS_FCL-RES=1
TARGET_DIRS_LIBGD=1
TARGET_DIRS_SYMBOLIC=1
TARGET_DIRS_BZIP2=1
TARGET_DIRS_HERMES=1
TARGET_DIRS_FPPKG=1
TARGET_DIRS_LIBOGCFPC=1
endif
ifeq ($(FULL_TARGET),sparc-linux)
TARGET_DIRS_HASH=1
TARGET_DIRS_PASJPEG=1
@ -9395,6 +9460,51 @@ palmunits:
$(MAKE) -C palmunits all
.PHONY: palmunits_all palmunits_debug palmunits_smart palmunits_release palmunits_units palmunits_examples palmunits_shared palmunits_install palmunits_sourceinstall palmunits_exampleinstall palmunits_distinstall palmunits_zipinstall palmunits_zipsourceinstall palmunits_zipexampleinstall palmunits_zipdistinstall palmunits_clean palmunits_distclean palmunits_cleanall palmunits_info palmunits_makefiles palmunits
endif
ifdef TARGET_DIRS_LIBOGCFPC
libogcfpc_all:
$(MAKE) -C libogcfpc all
libogcfpc_debug:
$(MAKE) -C libogcfpc debug
libogcfpc_smart:
$(MAKE) -C libogcfpc smart
libogcfpc_release:
$(MAKE) -C libogcfpc release
libogcfpc_units:
$(MAKE) -C libogcfpc units
libogcfpc_examples:
$(MAKE) -C libogcfpc examples
libogcfpc_shared:
$(MAKE) -C libogcfpc shared
libogcfpc_install:
$(MAKE) -C libogcfpc install
libogcfpc_sourceinstall:
$(MAKE) -C libogcfpc sourceinstall
libogcfpc_exampleinstall:
$(MAKE) -C libogcfpc exampleinstall
libogcfpc_distinstall:
$(MAKE) -C libogcfpc distinstall
libogcfpc_zipinstall:
$(MAKE) -C libogcfpc zipinstall
libogcfpc_zipsourceinstall:
$(MAKE) -C libogcfpc zipsourceinstall
libogcfpc_zipexampleinstall:
$(MAKE) -C libogcfpc zipexampleinstall
libogcfpc_zipdistinstall:
$(MAKE) -C libogcfpc zipdistinstall
libogcfpc_clean:
$(MAKE) -C libogcfpc clean
libogcfpc_distclean:
$(MAKE) -C libogcfpc distclean
libogcfpc_cleanall:
$(MAKE) -C libogcfpc cleanall
libogcfpc_info:
$(MAKE) -C libogcfpc info
libogcfpc_makefiles:
$(MAKE) -C libogcfpc makefiles
libogcfpc:
$(MAKE) -C libogcfpc all
.PHONY: libogcfpc_all libogcfpc_debug libogcfpc_smart libogcfpc_release libogcfpc_units libogcfpc_examples libogcfpc_shared libogcfpc_install libogcfpc_sourceinstall libogcfpc_exampleinstall libogcfpc_distinstall libogcfpc_zipinstall libogcfpc_zipsourceinstall libogcfpc_zipexampleinstall libogcfpc_zipdistinstall libogcfpc_clean libogcfpc_distclean libogcfpc_cleanall libogcfpc_info libogcfpc_makefiles libogcfpc
endif
all: $(addsuffix _all,$(TARGET_DIRS))
debug: $(addsuffix _debug,$(TARGET_DIRS))
smart: $(addsuffix _smart,$(TARGET_DIRS))

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/01]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/28]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@ -282,12 +282,17 @@ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
FPCFPMAKE:=$(FPCNATIVE)
else
FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
FPMAKE_SKIP_CONFIG=-n
export FPCFPMAKE
export FPMAKE_SKIP_CONFIG
endif
else
FPCFPMAKE=$(FPC)
endif
endif
FPMAKE_SKIP_CONFIG=-n
export FPCFPMAKE
export FPMAKE_SKIP_CONFIG
endif
endif
override PACKAGE_NAME=fpmkunit
override PACKAGE_VERSION=2.5.1
TARGET_UNITDIRBS=units_bs/$(SOURCESUFFIX)
@ -2769,6 +2774,6 @@ endif
$(TARGET_UNITDIRBS):
$(MKDIRTREE) $(TARGET_UNITDIRBS)
bootstrap: $(TARGET_UNITDIRBS)
$(FPCFPMAKE) src/fpmkunit.pp -n $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -dNO_UNIT_PROCESS -dNO_UNIT_ZIPPER -FU$(TARGET_UNITDIRBS)
$(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -dNO_UNIT_PROCESS -dNO_UNIT_ZIPPER -FU$(TARGET_UNITDIRBS)
cleanall: fpc_cleanall
-$(DELTREE) units_bs

View File

@ -32,7 +32,7 @@ CLEAN_FILES+=units_bs/$(SOURCESUFFIX)/fpmkunit.ppu units_bs/$(SOURCESUFFIX)/fpmk
$(TARGET_UNITDIRBS):
$(MKDIRTREE) $(TARGET_UNITDIRBS)
bootstrap: $(TARGET_UNITDIRBS)
$(FPCFPMAKE) src/fpmkunit.pp -n $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -dNO_UNIT_PROCESS -dNO_UNIT_ZIPPER -FU$(TARGET_UNITDIRBS)
$(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -dNO_UNIT_PROCESS -dNO_UNIT_ZIPPER -FU$(TARGET_UNITDIRBS)
cleanall: fpc_cleanall
-$(DELTREE) units_bs

File diff suppressed because it is too large Load Diff

View File

@ -330,7 +330,8 @@ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TA
#####################################################################
# FPC Binary and Version Detection
#####################################################################
# If FPCFPMAKE is not set and we're cross-compiling, use the native compiler.
# If FPCFPMAKE is not set and we're cross-compiling, try to find a
# native compiler.
ifndef FPCFPMAKE
ifdef CROSSCOMPILE
# Search for the (native) ppc compiler which is used to do the latest build
@ -344,11 +345,15 @@ else
# Use the ppc compiler. Because the path to the compiler is relative, do not
# evaluate the variable here, but do that on the fly.
FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
FPMAKE_SKIP_CONFIG=-n
export FPCFPMAKE
export FPMAKE_SKIP_CONFIG
endif
else
FPCFPMAKE=$(FPC)
FPMAKE_SKIP_CONFIG=-n
export FPCFPMAKE
export FPMAKE_SKIP_CONFIG
endif
endif