disable hardened ldflags again
only breaks x86_64 and armv7hl for static linking?: /usr/bin/ld.gold: error: /usr/lib64/ghc-8.2.2/rts/libHSrts_thr.a(MarkWeak.thr_o): requires unsupported dynamic reloc 11; recompile with -fPIC /usr/bin/ld.gold: error: /usr/lib/ghc-8.2.2/rts/libHSrts_thr.a(GCUtils.thr_o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
This commit is contained in:
parent
55f62273c3
commit
975f21c108
@ -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 <petersen@redhat.com> - 1.9.5-1
|
||||
- disable hardened ldflags again
|
||||
|
||||
* Fri Oct 5 2018 Jens Petersen <petersen@redhat.com> - 1.9.4-1
|
||||
- cabal_configure now uses ghc_set_gcc_flags
|
||||
|
||||
|
@ -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\
|
||||
|
Loading…
Reference in New Issue
Block a user