From: Jeremy Harris <jgh@wizmail.org>
Date: Tue, 12 Feb 2019 11:38:44 +0000 (+0000)
Subject: Revert "Move -stc=c99 to CFLAGS restricted to only 4.next"
X-Git-Url: https://git.exim.org/buildfarm-client.git/commitdiff_plain/c62559ff7f179fe5bfbf17940182f19acbbbb53f?ds=sidebyside

Revert "Move -stc=c99 to CFLAGS restricted to only 4.next"

This reverts commit f7ec5ba1bbea7563ea9084bb2f67a260f0041d65.
For 4.93 onwards, c99 is required for all active branches
---

diff --git a/build-farm.conf.template b/build-farm.conf.template
index cb08834..d2e4292 100644
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -169,7 +169,8 @@ our %conf =(
     # LDFLAGS => '-Wall'  will create  LDFLAGS+='-Wall'
     makefile_add =>{
         # Show all warnings and errors
-        CFLAGS => '-Wall -Wno-parentheses -Werror=format-security',
+	# Some platforms need the c99 setting enabled
+        CFLAGS => '-std=c99 -Wall -Wno-parentheses -Werror=format-security',
         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',
@@ -251,11 +252,4 @@ if ($branch eq 'global')
 #	$conf{makefile_set}{SUPPORT_DANE} = '';
 #}
 
-# Some platforms need the c99 setting enabled for 4.next, which starts using more c99 syntax
-if ($branch eq '4.next')
-{
-        $conf{makefile_add}{CFLAGS} .= ' -std=c99';
-}
-
-
 1;