silence C Wunused-label warnings flood on s390x again

ghc-rpm-macros.spec

@@ -11,7 +11,7 @@
 
 Name:           ghc-rpm-macros
 Version:        1.9.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
 License:        GPLv3+
@@ -175,6 +175,9 @@ EOF
 
 
 %changelog
+* Wed Oct 24 2018 Jens Petersen <petersen@redhat.com> - 1.9.5-4
+- silence C compiler Wunused-label warnings flood on s390x again
+
 * Tue Oct 23 2018 Jens Petersen <petersen@redhat.com> - 1.9.5-3
 - f29: obsolete content-store, bdcs, and bdcs-api
 

macros.ghc

@@ -11,7 +11,13 @@ LANG=en_US.utf8\
 
 
 %ghc_set_gcc_flags\
-export CFLAGS="${CFLAGS:-%optflags}"\
+# -Wunused-label is extremely noisy\
+%ifarch s390x\
+CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall //')}"\
+%else\
+CFLAGS="${CFLAGS:-%optflags}"\
+%endif\
+export CFLAGS\
 %global _hardened_ldflags %{nil}\
 export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\
 %{nil}