From a5c35798fad659100df16146f5ab886e45d324ab Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Wed, 26 Dec 2018 21:07:12 -0800
Subject: [PATCH] BLD: move -std=c99 from runtests.py to Azure config

See gh-12610 for details.
---
 azure-pipelines.yml | 2 +-
 runtests.py         | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6e7975039a55..d935c3c6c144 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -27,7 +27,7 @@ jobs:
            cd ../numpy && \
            NUMPY_EXPERIMENTAL_ARRAY_FUNCTION=1 \
            F77=gfortran-5 F90=gfortran-5 \
-           CFLAGS=-UNDEBUG python3 runtests.py --mode=full -- -rsx --junitxml=junit/test-results.xml"
+           CFLAGS='-UNDEBUG -std=c99' python3 runtests.py --mode=full -- -rsx --junitxml=junit/test-results.xml"
     displayName: 'Run 32-bit Ubuntu Docker Build / Tests'
   - task: PublishTestResults@2
     inputs:
diff --git a/runtests.py b/runtests.py
index 41768a2ea593..42866714f313 100755
--- a/runtests.py
+++ b/runtests.py
@@ -351,8 +351,6 @@ def build_project(args):
                 '-Werror=unused-function',
             ])
             env['CFLAGS'] = warnings_as_errors + ' ' + env.get('CFLAGS', '')
-            # NumPy > 1.16 should be C99 compatible.
-            env['CFLAGS'] = '-std=c99' + ' ' + env.get('CFLAGS', '')
     if args.debug or args.gcov:
         # assume everyone uses gcc/gfortran
         env['OPT'] = '-O0 -ggdb'