From b47d44f0861248282d1cd923d3abf80cd638d079 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Feb 12 2022 06:18:51 +0000
Subject: %ghc_set_gcc_flags: always sed CFLAGS whether pre-set or not


Needed for F36 https://fedoraproject.org/wiki/Changes/SetBuildFlagsBuildCheck

---

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 6b23f8d..03b7a66 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           ghc-rpm-macros
-Version:        2.3.13
+Version:        2.3.14
 Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
@@ -184,6 +184,10 @@ EOF
 
 
 %changelog
+* Sat Feb 12 2022 Jens Petersen <petersen@redhat.com> - 2.3.14-1
+- ghc_set_gcc_flags: also sed CFLAGS when preset in F36
+  because of https://fedoraproject.org/wiki/Changes/SetBuildFlagsBuildCheck
+
 * Tue Feb  8 2022 Jens Petersen <petersen@redhat.com> - 2.3.13-1
 - ghc_set_gcc_flags: disable _lto_cflags for all archs
   to address missing symbol linking errors across packages
diff --git a/macros.ghc b/macros.ghc
index 370c48c..34ec75a 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -14,7 +14,7 @@ LANG=C.utf8\
 %global _lto_cflags %{nil}\
 # -Wunused-label is extremely noisy\
 %ifarch s390x\
-CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall //' -e 's/-Werror=format-security //')}"\
+CFLAGS="$(echo ${CFLAGS:-%optflags} | sed -e 's/-Wall //' -e 's/-Werror=format-security //')"\
 %else\
 CFLAGS="${CFLAGS:-%optflags}"\
 %endif\