summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-07-25 13:57:53 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-07-25 13:57:53 -0400
commit2f63f062e5b046d687c30810b4f55e0ba4671125 (patch)
tree79a522ee69c1f23d3dc50b1af14eed5fd6a877a4 /git-annex.cabal
parent86234f404a93fb352ecba16076e9347deef04d4c (diff)
Always build with -threaded, to avoid a deadlock when communicating with gpg.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index cfaeacb03..b9715b847 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -82,6 +82,8 @@ Executable git-annex
GHC-Options: -Wall
CPP-Options: -DWITH_CLIBS
Extensions: PackageImports
+ -- Some things don't work with the non-threaded RTS.
+ GHC-Options: -threaded
if flag(Production)
GHC-Options: -O2
@@ -139,7 +141,6 @@ Executable git-annex
blaze-builder, crypto-api, hamlet, clientsession, aeson,
template-haskell, data-default
CPP-Options: -DWITH_WEBAPP
- GHC-Options: -threaded
if flag(Pairing)
Build-Depends: network-multicast, network-info