|
|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
|
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-04-26 rev 24324]
|
|
|
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-04-25 rev 24324]
|
|
|
#
|
|
|
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 i386-android 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 arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android i8086-msdos
|
|
|
@@ -321,8 +321,8 @@ endif
|
|
|
endif
|
|
|
override PACKAGE_NAME=fpc
|
|
|
override PACKAGE_VERSION=2.7.1
|
|
|
-REQUIREDVERSION=2.6.0
|
|
|
-REQUIREDVERSION2=2.6.2
|
|
|
+REQUIREDVERSION=2.6.2
|
|
|
+REQUIREDVERSION2=2.6.0
|
|
|
ifndef inOS2
|
|
|
override FPCDIR:=$(BASEDIR)
|
|
|
export FPCDIR
|
|
|
@@ -2698,10 +2698,12 @@ BUILDSTAMP=build-stamp.$(FULL_TARGET)
|
|
|
.PHONY: singlezipinstall versioncheckstartingcompiler
|
|
|
versioncheckstartingcompiler:
|
|
|
ifndef CROSSCOMPILE
|
|
|
-ifndef OVERRIDEVERSIONCHECK
|
|
|
ifneq ($(FPC_VERSION),$(REQUIREDVERSION))
|
|
|
ifneq ($(FPC_VERSION),$(REQUIREDVERSION2))
|
|
|
+ifndef OVERRIDEVERSIONCHECK
|
|
|
$(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 )
|
|
|
+else
|
|
|
+ @$(ECHO) You have overriden the starting compiler versioncheck while using starting compiler version $(FPC_VERSION). This situation is not supported and strange things and errors may happen. Remove OVERRIDEVERSIONCHECK=1 to fix this.
|
|
|
endif
|
|
|
endif
|
|
|
endif
|
marco