Merge commit #42582:

------------------------------------------------------------------------
r42582 | pierre | 2019-08-05 09:02:16 +0000 (Mon, 05 Aug 2019) | 1 line

 Do not use -Sew (turn warnings into errors) if CYCLELEVEL is equal to 1
------------------------------------------------------------------------
--- Merging r42582 into '.':
U    compiler/Makefile
U    compiler/Makefile.fpc
--- Recording mergeinfo for merge of r42582 into '.':
 U   .

git-svn-id: branches/fixes_3_2@45869 -
This commit is contained in:
pierre 2020-07-28 14:51:42 +00:00
parent 0a7bb007e0
commit 43b80d4afa
2 changed files with 2 additions and 2 deletions

View File

@ -4193,7 +4193,7 @@ ifdef CMP
override DIFF:=$(CMP) -i218 override DIFF:=$(CMP) -i218
endif endif
endif endif
ifeq ($(findstring 2.4.,$(FPC_VERSION)),) ifneq ($(CYCLELEVEL),1)
ifndef ALLOW_WARNINGS ifndef ALLOW_WARNINGS
override LOCALOPT+=-Sew override LOCALOPT+=-Sew
endif endif

View File

@ -376,7 +376,7 @@ endif
# Use -Sew option by default # Use -Sew option by default
# Allow disabling by setting ALLOW_WARNINGS=1 # Allow disabling by setting ALLOW_WARNINGS=1
ifeq ($(findstring 2.4.,$(FPC_VERSION)),) ifneq ($(CYCLELEVEL),1)
ifndef ALLOW_WARNINGS ifndef ALLOW_WARNINGS
override LOCALOPT+=-Sew override LOCALOPT+=-Sew
endif endif