diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 17fa5db..a1e3cf2 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.8.6 +Version: 1.8.7 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -162,6 +162,9 @@ EOF %changelog +* Sat Feb 3 2018 Jens Petersen - 1.8.7-1 +- no longer need to prune -z defs from LDFLAGS + * Mon Jan 29 2018 Jens Petersen - 1.8.6-1 - cabal-tweak-drop-dep: quote grep pattern to allow whitespace diff --git a/macros.ghc b/macros.ghc index 4cecaf8..9cc6d1a 100644 --- a/macros.ghc +++ b/macros.ghc @@ -37,7 +37,7 @@ export CFLAGS\ %ghc_check_bootstrap\ %ghc_set_cflags\ %global _hardened_ldflags %{nil}\ -LDFLAGS="${LDFLAGS:-$(echo %{?__global_ldflags} | sed -e 's/-Wl,-z,defs//')}"; export LDFLAGS\ +LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\ %cabal --version\ %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc %{?_ghcdynlibdir:--dynlibdir=%{_ghcdynlibdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')}" %{?cabal_configure_options} $cabal_configure_extra_options