mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

cabal sdist refuses to build with -O1

Browse source 
Sigh, disabled the full fix. What we have now will work once the ghc bug
is fixed, but not currently.
This commit is contained in:
Joey Hess 2018-03-16 12:56:28 -04:00
parent 4af5507889
commit bc1d56bdfd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -45,6 +45,7 @@ git-annex (6.20180316) upstream; urgency=medium
* Include amount of data transferred in progress display. * Include amount of data transferred in progress display.
* Dial back optimisation when building on arm, which prevents * Dial back optimisation when building on arm, which prevents
ghc and llc from running out of memory when optimising some files. ghc and llc from running out of memory when optimising some files.
(Unfortunately this fix is incomplete due to a ghc bug.)
-- Joey Hess <id@joeyh.name> Fri, 16 Mar 2018 12:10:40 -0400 -- Joey Hess <id@joeyh.name> Fri, 16 Mar 2018 12:10:40 -0400

5
git-annex.cabal
View file

@ -379,8 +379,11 @@ Executable git-annex
if flag(Production) if flag(Production)
-- Lower memory systems can run out of memory with -O2, so -- Lower memory systems can run out of memory with -O2, so
-- optimise slightly less. -- optimise slightly less.
-- This needs -O1 before the -optlo, due to this bug:
-- https://ghc.haskell.org/trac/ghc/ticket/14821
-- But unfortunately, hackage currently refuses to accept -O1
if arch(arm) if arch(arm)
GHC-Options: -O1 -optlo-O2 GHC-Options: -optlo-O2
else else
GHC-Options: -O2 GHC-Options: -O2