From 5b2544a8cce900ff62a9d1209edac849e8ab9e31 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Oct 24 2018 15:12:12 +0000 Subject: silence C Wunused-label warnings flood on s390x again --- diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index f7f6e38..3716fa7 100644 --- a/ghc-rpm-macros.spec +++ b/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 - 1.9.5-4 +- silence C compiler Wunused-label warnings flood on s390x again + * Tue Oct 23 2018 Jens Petersen - 1.9.5-3 - f29: obsolete content-store, bdcs, and bdcs-api diff --git a/macros.ghc b/macros.ghc index 1dbeb50..1e0dba9 100644 --- a/macros.ghc +++ b/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}