From c8e6b2564f0f34e2ca410c86de7d5eb6703e2f36 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Tue, 1 Sep 2020 12:17:58 +0200
Subject: [PATCH] Prepend compiler warning flags to CFLAG instead to append
 them

---
 Zend/Zend.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index 76f9dd8810c74..3fdba96c97e70 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -212,9 +212,9 @@ else
   AC_DEFINE(ZEND_DEBUG,0,[ ])
 fi
 
-test -n "$GCC" && CFLAGS="$CFLAGS -Wall -Wextra -Wno-strict-aliasing -Wno-implicit-fallthrough -Wno-unused-parameter -Wno-sign-compare"
+test -n "$GCC" && CFLAGS="-Wall -Wextra -Wno-strict-aliasing -Wno-implicit-fallthrough -Wno-unused-parameter -Wno-sign-compare $CFLAGS"
 dnl Check if compiler supports -Wno-clobbered (only GCC)
-AX_CHECK_COMPILE_FLAG([-Wno-clobbered], CFLAGS="$CFLAGS -Wno-clobbered", , [-Werror])
+AX_CHECK_COMPILE_FLAG([-Wno-clobbered], CFLAGS="-Wno-clobbered $CFLAGS", , [-Werror])
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"