* starting compiler version check to toplevel "all" target

git-svn-id: trunk@22708 -
This commit is contained in:
marco 2012-10-17 18:03:41 +00:00
parent fb60e17602
commit 06bd08697e
2 changed files with 115 additions and 5 deletions

105
Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/09/27]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/10/11]
#
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 powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd 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 powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
@ -304,6 +304,7 @@ endif
endif
override PACKAGE_NAME=fpc
override PACKAGE_VERSION=2.7.1
REQUIREDVERSION=2.6.0
ifndef inOS2
override FPCDIR:=$(BASEDIR)
export FPCDIR
@ -2311,6 +2312,51 @@ TARGET_DIRS_PACKAGES=1
TARGET_DIRS_IDE=1
TARGET_DIRS_INSTALLER=1
endif
ifdef TARGET_DIRS_TARGET_DIRS
TARGET_DIRS_all:
$(MAKE) -C TARGET_DIRS all
TARGET_DIRS_debug:
$(MAKE) -C TARGET_DIRS debug
TARGET_DIRS_smart:
$(MAKE) -C TARGET_DIRS smart
TARGET_DIRS_release:
$(MAKE) -C TARGET_DIRS release
TARGET_DIRS_units:
$(MAKE) -C TARGET_DIRS units
TARGET_DIRS_examples:
$(MAKE) -C TARGET_DIRS examples
TARGET_DIRS_shared:
$(MAKE) -C TARGET_DIRS shared
TARGET_DIRS_install:
$(MAKE) -C TARGET_DIRS install
TARGET_DIRS_sourceinstall:
$(MAKE) -C TARGET_DIRS sourceinstall
TARGET_DIRS_exampleinstall:
$(MAKE) -C TARGET_DIRS exampleinstall
TARGET_DIRS_distinstall:
$(MAKE) -C TARGET_DIRS distinstall
TARGET_DIRS_zipinstall:
$(MAKE) -C TARGET_DIRS zipinstall
TARGET_DIRS_zipsourceinstall:
$(MAKE) -C TARGET_DIRS zipsourceinstall
TARGET_DIRS_zipexampleinstall:
$(MAKE) -C TARGET_DIRS zipexampleinstall
TARGET_DIRS_zipdistinstall:
$(MAKE) -C TARGET_DIRS zipdistinstall
TARGET_DIRS_clean:
$(MAKE) -C TARGET_DIRS clean
TARGET_DIRS_distclean:
$(MAKE) -C TARGET_DIRS distclean
TARGET_DIRS_cleanall:
$(MAKE) -C TARGET_DIRS cleanall
TARGET_DIRS_info:
$(MAKE) -C TARGET_DIRS info
TARGET_DIRS_makefiles:
$(MAKE) -C TARGET_DIRS makefiles
TARGET_DIRS:
$(MAKE) -C TARGET_DIRS all
.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS
endif
ifdef TARGET_DIRS_COMPILER
compiler_all:
$(MAKE) -C compiler all
@ -2581,6 +2627,51 @@ installer:
$(MAKE) -C installer all
.PHONY: installer_all installer_debug installer_smart installer_release installer_units installer_examples installer_shared installer_install installer_sourceinstall installer_exampleinstall installer_distinstall installer_zipinstall installer_zipsourceinstall installer_zipexampleinstall installer_zipdistinstall installer_clean installer_distclean installer_cleanall installer_info installer_makefiles installer
endif
ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS
TARGET_EXAMPLEDIRS_all:
$(MAKE) -C TARGET_EXAMPLEDIRS all
TARGET_EXAMPLEDIRS_debug:
$(MAKE) -C TARGET_EXAMPLEDIRS debug
TARGET_EXAMPLEDIRS_smart:
$(MAKE) -C TARGET_EXAMPLEDIRS smart
TARGET_EXAMPLEDIRS_release:
$(MAKE) -C TARGET_EXAMPLEDIRS release
TARGET_EXAMPLEDIRS_units:
$(MAKE) -C TARGET_EXAMPLEDIRS units
TARGET_EXAMPLEDIRS_examples:
$(MAKE) -C TARGET_EXAMPLEDIRS examples
TARGET_EXAMPLEDIRS_shared:
$(MAKE) -C TARGET_EXAMPLEDIRS shared
TARGET_EXAMPLEDIRS_install:
$(MAKE) -C TARGET_EXAMPLEDIRS install
TARGET_EXAMPLEDIRS_sourceinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall
TARGET_EXAMPLEDIRS_exampleinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall
TARGET_EXAMPLEDIRS_distinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS distinstall
TARGET_EXAMPLEDIRS_zipinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS zipinstall
TARGET_EXAMPLEDIRS_zipsourceinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall
TARGET_EXAMPLEDIRS_zipexampleinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall
TARGET_EXAMPLEDIRS_zipdistinstall:
$(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall
TARGET_EXAMPLEDIRS_clean:
$(MAKE) -C TARGET_EXAMPLEDIRS clean
TARGET_EXAMPLEDIRS_distclean:
$(MAKE) -C TARGET_EXAMPLEDIRS distclean
TARGET_EXAMPLEDIRS_cleanall:
$(MAKE) -C TARGET_EXAMPLEDIRS cleanall
TARGET_EXAMPLEDIRS_info:
$(MAKE) -C TARGET_EXAMPLEDIRS info
TARGET_EXAMPLEDIRS_makefiles:
$(MAKE) -C TARGET_EXAMPLEDIRS makefiles
TARGET_EXAMPLEDIRS:
$(MAKE) -C TARGET_EXAMPLEDIRS all
.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS
endif
debug: $(addsuffix _debug,$(TARGET_DIRS))
smart: $(addsuffix _smart,$(TARGET_DIRS))
release: $(addsuffix _release,$(TARGET_DIRS))
@ -2619,12 +2710,20 @@ compiler_cycle:
$(MAKE) -C compiler cycle
BUILDSTAMP=build-stamp.$(FULL_TARGET)
.PHONY: all clean distclean build buildbase install installbase installother zipinstallbase zipinstallotherzipinstall singlezipinstall
versioncheckstartingcompiler:
ifndef CROSSCOMPILE
ifndef OVERRIDEVERSIONCHECK
ifneq ($(FPC_VERSION),$(REQUIREDVERSION))
$(error The only supported starting compiler version is $(REQUIREDVERSION). You try to build with $(FPC_VERSION). If you are absolutely sure that the current compiler is built from the exact same version/revision, you can try to use OVERRIDEVERSIONCHECK=1 to override )
endif
endif
endif
ifeq ($(findstring $(CPU_TARGET),$(BuildOnlyBaseCPUs)),)
all: build
all: versioncheckstartingcompiler build
install: installall
zipinstall: zipinstallall
else
all: buildbase
all: versioncheckstartingcompiler buildbase
install: installbase
zipinstall: zipinstallbase
endif

View File

@ -20,6 +20,9 @@ fpcdir=.
rule=help
[prerules]
REQUIREDVERSION=2.6.0
# make versions < 3.77 (OS2 version) are buggy
ifndef inOS2
override FPCDIR:=$(BASEDIR)
@ -236,13 +239,21 @@ BUILDSTAMP=build-stamp.$(FULL_TARGET)
.PHONY: all clean distclean build buildbase install installbase installother zipinstallbase zipinstallotherzipinstall singlezipinstall
versioncheckstartingcompiler:
ifndef CROSSCOMPILE
ifndef OVERRIDEVERSIONCHECK
ifneq ($(FPC_VERSION),$(REQUIREDVERSION))
$(error The only supported starting compiler version is $(REQUIREDVERSION). You are trying to build with $(FPC_VERSION). If you are absolutely sure that the current compiler is built from the exact same version/revision, you can try to use OVERRIDEVERSIONCHECK=1 to override )
endif
endif
endif
ifeq ($(findstring $(CPU_TARGET),$(BuildOnlyBaseCPUs)),)
all: build
all: versioncheckstartingcompiler build
install: installall
zipinstall: zipinstallall
else
all: buildbase
all: versioncheckstartingcompiler buildbase
install: installbase
zipinstall: zipinstallbase
endif