diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 29c80f6..adf8772 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,7 +10,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.9.4 +Version: 1.9.5 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -170,6 +170,9 @@ EOF %changelog +* Sat Oct 6 2018 Jens Petersen - 1.9.5-1 +- disable hardened ldflags again + * Fri Oct 5 2018 Jens Petersen - 1.9.4-1 - cabal_configure now uses ghc_set_gcc_flags diff --git a/macros.ghc b/macros.ghc index d3712a2..94e4303 100644 --- a/macros.ghc +++ b/macros.ghc @@ -10,16 +10,15 @@ LANG=en_US.utf8\ %ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override} -%ghc_set_gcc_flags\ +%ghc_set_cflags\ export CFLAGS="${CFLAGS:-%optflags}"\ +%global _hardened_ldflags %{nil}\ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\ %{nil} # configure %cabal_configure\ %ghc_set_gcc_flags\ -%global _hardened_ldflags %{nil}\ -LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\ if ! [ -f Setup.hs -o -f Setup.lhs ]; then\ cp %{_datadir}/ghc-rpm-macros/Setup.hs .\ fi\