summaryrefslogtreecommitdiff
path: root/git-annex.cabal
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-10-17 16:35:14 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-10-17 16:35:14 -0400
commit699a90bdc195a67c5aa5fca34fcaa07fb2b530ae (patch)
treee99efef516c2acbb7878bda4e478ec66e9a065cb /git-annex.cabal
parent75bfb04d5d63fe7ad91213606b1bb22ee5e7b4ff (diff)
avoid hsc files on Windows
This used to work, but now hsc2hs is failing with a usage message. Since I have not changed my windows build environment at all, it must be some change due to a change in the cabal file. Perhaps too make flags are causing it to hit a windows command line length limit? Anyway, these hsc files did nothing on Windows, so can be omitted and not built to work around yet another epic windows weirdness.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r--git-annex.cabal12
1 files changed, 7 insertions, 5 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 20ac48511..17b83796a 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -83,13 +83,8 @@ 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
@@ -98,6 +93,13 @@ 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)