From 05a5bef533f54f3c73fa035ae8111cb1969111f7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 18 Sep 2023 17:40:03 +0800 Subject: [PATCH] ghc_set_gcc_flags: only reduce GCC for s390x for ghc < 9.2 This should really just be for unregisterised ghc $ ghc --info | grep reg ,("Unregisterised","NO") --- macros.ghc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/macros.ghc b/macros.ghc index a8cb43c..c68ac4b 100644 --- a/macros.ghc +++ b/macros.ghc @@ -78,11 +78,12 @@ fi\ %ghc_set_gcc_flags\ %global _lto_cflags %{nil}\ %global __brp_strip_lto %{nil}\ -# -Wunused-label is extremely noisy\ +CFLAGS="${CFLAGS:-%optflags}"\ %ifarch s390x\ +%if %[v"%{ghc_version}" < v"9.2"]\ +# -Wunused-label is extremely noisy\ CFLAGS="$(echo ${CFLAGS:-%optflags} | sed -e 's/-Wall //' -e 's/-Werror=format-security //')"\ -%else\ -CFLAGS="${CFLAGS:-%optflags}"\ +%endif\ %endif\ export CFLAGS\ %undefine _package_note_flags\