mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-06 02:08:18 +02:00
* Only export FPCFPMAKE when a suitable compiler is found, or else
it won't be detected when that compiler becomes available later in the compile process. Bug #19263 git-svn-id: trunk@17500 -
This commit is contained in:
joost
parent
f53a14ec38
commit
44a43c63da
7
Makefile
7
Makefile
@ -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/19]
|
||||
#
|
||||
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,12 +282,13 @@ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
|
||||
FPCFPMAKE:=$(FPCNATIVE)
|
||||
else
|
||||
FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
|
||||
export FPCFPMAKE
|
||||
endif
|
||||
else
|
||||
FPCFPMAKE=$(FPC)
|
||||
endif
|
||||
endif
|
||||
export FPCFPMAKE
|
||||
endif
|
||||
endif
|
||||
override PACKAGE_NAME=fpc
|
||||
override PACKAGE_VERSION=2.5.1
|
||||
ifndef inOS2
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/03/21]
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/05/19]
|
||||
#
|
||||
default: all
|
||||
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
|
||||
@ -107,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,19 @@ 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))))
|
||||
export FPCFPMAKE
|
||||
endif
|
||||
else
|
||||
FPCFPMAKE=$(FPC)
|
||||
export FPCFPMAKE
|
||||
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 httpd13 httpd20 httpd22 pxlib numlib gmp libsee ptc graph libc unixutil graph pxlib bzip2
|
||||
endif
|
||||
@ -1479,6 +1504,7 @@ fpc_baseinfo:
|
||||
@$(ECHO) Full Target.. $(FULL_TARGET)
|
||||
@$(ECHO) SourceSuffix. $(SOURCESUFFIX)
|
||||
@$(ECHO) TargetSuffix. $(TARGETSUFFIX)
|
||||
@$(ECHO) FPC fpmake... $(FPCFPMAKE)
|
||||
@$(ECHO)
|
||||
@$(ECHO) == Directory info ==
|
||||
@$(ECHO)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -337,18 +337,21 @@ ifdef CROSSCOMPILE
|
||||
# of the native rtl
|
||||
ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
|
||||
# If that compiler is not found, use the common, installed native compiler
|
||||
# Note that in this case FPCFPMAKE is not exported, because it could be that
|
||||
# this compiler is compiled later on
|
||||
FPCFPMAKE:=$(FPCNATIVE)
|
||||
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))))
|
||||
export FPCFPMAKE
|
||||
endif
|
||||
else
|
||||
FPCFPMAKE=$(FPC)
|
||||
export FPCFPMAKE
|
||||
endif
|
||||
endif
|
||||
|
||||
export FPCFPMAKE
|
||||
|
||||
[fpcdircheckenv]
|
||||
#####################################################################
|
||||
|
||||
Loading…
Reference in New Issue
Block a user