From a71ef652e7b6ad42e92627b99ea29d43bb55b80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Thu, 14 Jun 2018 23:38:36 +0200
Subject: [PATCH] makefiles/cflags.inc.mk: move excluded patterns out of
 conditional

The excluded patterns can always be defined as they only set `CFLAGS` that
should not be passed to `CXX`.

This prepares for replacing the cflags support detection by a function.
---
 makefiles/cflags.inc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makefiles/cflags.inc.mk b/makefiles/cflags.inc.mk
index f91d1a3bea..160469fbc8 100644
--- a/makefiles/cflags.inc.mk
+++ b/makefiles/cflags.inc.mk
@@ -39,11 +39,11 @@ endif
 ifeq ($(shell $(CC) -Wstrict-prototypes -Werror=strict-prototypes -Wold-style-definition -Werror=old-style-definition -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
   # duplicated parameters don't hurt
   CFLAGS += -Wstrict-prototypes -Wold-style-definition
-  CXXUWFLAGS += -Wstrict-prototypes -Wold-style-definition
 endif
 
 # Unwanted flags for c++
 CXXUWFLAGS += -std=%
+CXXUWFLAGS += -Wstrict-prototypes -Wold-style-definition
 
 ifeq ($(LTO),1)
   $(warning Building with Link-Time-Optimizations is currently an experimental feature. Expect broken binaries.)
-- 
GitLab