Browse Source

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 -

pierre 5 years ago
parent
commit
43b80d4afa
2 changed files with 2 additions and 2 deletions
  1. 1 1
      compiler/Makefile
  2. 1 1
      compiler/Makefile.fpc

+ 1 - 1
compiler/Makefile

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

+ 1 - 1
compiler/Makefile.fpc

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