Merge branch 'ospath-mk1' into ospath
This commit is contained in:
commit
c21526e3e2
1 changed files with 6 additions and 8 deletions
|
@ -333,14 +333,12 @@ Executable git-annex
|
||||||
P2P.Http.State
|
P2P.Http.State
|
||||||
|
|
||||||
if flag(OsPath)
|
if flag(OsPath)
|
||||||
-- Currently this build flag does not pass the test suite on Windows
|
Build-Depends:
|
||||||
if (! os(windows))
|
os-string (>= 2.0.0),
|
||||||
Build-Depends:
|
directory (>= 1.3.8.3),
|
||||||
os-string (>= 2.0.0),
|
filepath (>= 1.5.2.0),
|
||||||
directory (>= 1.3.8.3),
|
file-io (>= 0.1.3)
|
||||||
filepath (>= 1.5.2.0),
|
CPP-Options: -DWITH_OSPATH
|
||||||
file-io (>= 0.1.3)
|
|
||||||
CPP-Options: -DWITH_OSPATH
|
|
||||||
|
|
||||||
if (os(windows))
|
if (os(windows))
|
||||||
Build-Depends:
|
Build-Depends:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue