diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 9f526f3..29c80f6 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,8 +10,8 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.9.3 -Release: 2%{?dist} +Version: 1.9.4 +Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -170,6 +170,9 @@ EOF %changelog +* Fri Oct 5 2018 Jens Petersen - 1.9.4-1 +- cabal_configure now uses ghc_set_gcc_flags + * Fri Oct 5 2018 Jens Petersen - 1.9.3-1 - disable dynamic linking of executables for better portability - replace ghc_set_cflags with simplified ghc_set_gcc_flags diff --git a/macros.ghc b/macros.ghc index 1a48dfc..d3712a2 100644 --- a/macros.ghc +++ b/macros.ghc @@ -17,7 +17,7 @@ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\ # configure %cabal_configure\ -%ghc_set_cflags\ +%ghc_set_gcc_flags\ %global _hardened_ldflags %{nil}\ LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\ if ! [ -f Setup.hs -o -f Setup.lhs ]; then\