diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-06 09:35:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-06 09:35:43 -0400 |
| commit | 10635fea01282eb041fc434e5b1186b0b5a5ae97 (patch) | |
| tree | 40c2ade3591a10cf632b91927351b36a97384ab2 | |
| parent | d030f2c9146458ca0dd30e970c8b3eff47bb4268 (diff) | |
Disable building with the haskell threaded runtime when the assistant is not built. This may fix builds on s390x and sparc, which are failing to link -lHSrts_thr
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | git-annex.cabal | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d5152ae53..aee6ca1ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ git-annex (4.20130502) UNRELEASED; urgency=low * Temporarily add an upper bound to the version of yesod that can be built with, since yesod 1.2 has a great many changes that will require extensive work on the webapp. + * Disable building with the haskell threaded runtime when the assistant + is not built. This may fix builds on s390x and sparc, which are failing + to link -lHSrts_thr -- Joey Hess <joeyh@debian.org> Thu, 02 May 2013 20:39:19 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index 79bb59ca7..b1a2e20c3 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -76,7 +76,7 @@ Executable git-annex Include-Dirs: Utility C-Sources: Utility/libdiskfree.c Utility/libmounts.c CC-Options: -Wall - GHC-Options: -threaded -Wall + GHC-Options: -Wall CPP-Options: -DWITH_CLIBS Extensions: PackageImports @@ -98,6 +98,7 @@ Executable git-annex if flag(Assistant) && ! os(windows) && ! os(solaris) Build-Depends: async, stm (>= 2.3) CPP-Options: -DWITH_ASSISTANT + GHC-Options: -threaded if flag(Android) Build-Depends: data-endian |