summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-10-17 17:53:50 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-10-17 17:53:50 -0400
commit659570ea45c917bffe58c0389b8d7c6b910136c6 (patch)
treeae1ea24f9a39003e3c9320544e809f786b490e8d /git-annex.cabal
parentecd72936a56320d0aceb431f795c457061be3d27 (diff)
Revert "avoid hsc files on Windows"
This reverts commit 699a90bdc195a67c5aa5fca34fcaa07fb2b530ae. My windows build environment was broken; reverted to backup.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal12
1 files changed, 5 insertions, 7 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 17b83796a..20ac48511 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -83,8 +83,13 @@ Executable git-annex
base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers,
IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process,
SafeSemaphore, uuid, random, dlist, unix-compat
+ -- Need to list these because they're generated from .hsc files.
+ Other-Modules: Utility.Touch Utility.Mounts
+ Include-Dirs: Utility
+ C-Sources: Utility/libdiskfree.c Utility/libmounts.c
CC-Options: -Wall
GHC-Options: -Wall
+ CPP-Options: -DWITH_CLIBS
Extensions: PackageImports
-- Some things don't work with the non-threaded RTS.
GHC-Options: -threaded
@@ -93,13 +98,6 @@ Executable git-annex
GHC-Options: -O2
if (! os(windows))
- -- hsc files
- Other-Modules: Utility.Touch Utility.Mounts
- Include-Dirs: Utility
- C-Sources: Utility/libdiskfree.c Utility/libmounts.c
- CPP-Options: -DWITH_CLIBS
-
- if (! os(windows))
Build-Depends: unix
if flag(TestSuite)