From fb18eac0f308f50c9034a60b619cb1c0d840dfec Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Tue, 14 Oct 2014 21:17:25 +0000 Subject: [PATCH] * don't mention the ability to use OVERRIDEVERSIONCHECK, too many people use it wrongly in spite of all the warnings. Look it up in the Makefile if you forgot the name of the setting. git-svn-id: trunk@28821 - --- Makefile | 2 +- Makefile.fpc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 294e7db4e9..2f1c7472ca 100644 --- a/Makefile +++ b/Makefile @@ -2770,7 +2770,7 @@ ifndef CROSSCOMPILE 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 ) + $(error The only supported starting compiler version is $(REQUIREDVERSION). You are trying to build with $(FPC_VERSION). 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 diff --git a/Makefile.fpc b/Makefile.fpc index 37a3788964..93f28cb9d5 100644 --- a/Makefile.fpc +++ b/Makefile.fpc @@ -268,7 +268,7 @@ ifndef CROSSCOMPILE 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 ) + $(error The only supported starting compiler version is $(REQUIREDVERSION). You are trying to build with $(FPC_VERSION). 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