explicitly disable WebDAV on Windows
For reasons suspiciously similar to 342d508e
-- ie, building with it
enabled crashes the compiler, at least in my development VM.. dunno why.
This commit is contained in:
parent
aef1d7e76d
commit
4ebb35dc59
2 changed files with 5 additions and 2 deletions
|
@ -124,7 +124,7 @@ Executable git-annex
|
|||
Build-Depends: hS3
|
||||
CPP-Options: -DWITH_S3
|
||||
|
||||
if flag(WebDAV)
|
||||
if flag(WebDAV) && (! os(windows))
|
||||
Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types
|
||||
CPP-Options: -DWITH_WEBDAV
|
||||
|
||||
|
|
|
@ -7,7 +7,9 @@ set -x
|
|||
set -e
|
||||
|
||||
HP="/c/Program Files (x86)/Haskell Platform/2012.4.0.0"
|
||||
FLAGS="-Webapp -Assistant -XMPP"
|
||||
|
||||
# Any cabal build flags go here.
|
||||
FLAGS=""
|
||||
|
||||
PATH="$HP/bin:$HP/lib/extralibs/bin:/c/Program Files (x86)/NSIS:$PATH"
|
||||
|
||||
|
@ -52,5 +54,6 @@ withcyg Build/NullSoftInstaller.exe
|
|||
rm -f last-incremental-failed
|
||||
|
||||
# Test git-annex
|
||||
# (doesn't currently work well on autobuilder, reason unknown)
|
||||
rm -rf .t
|
||||
withcyg dist/build/git-annex/git-annex.exe test || true
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue