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

diff --git a/build-farm.conf.template b/build-farm.conf.template
index d2e429204d98d99f18c698107ecd36ee9e7bef70..cb08834c5c9945bea2f9c4105d0efeebdb8b1552 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -169,8 +169,7 @@ our %conf =(
     # LDFLAGS => '-Wall'  will create  LDFLAGS+='-Wall'
     makefile_add =>{
         # Show all warnings and errors
-       # Some platforms need the c99 setting enabled
-        CFLAGS => '-std=c99 -Wall -Wno-parentheses -Werror=format-security',
+        CFLAGS => '-Wall -Wno-parentheses -Werror=format-security',
         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',
@@ -252,4 +251,11 @@ 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;