aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2015-08-10 09:14:00 +0200
committerDaniel Gröber <dxld@darkboxed.org>2015-08-10 09:28:44 +0200
commita3c3997626264ebce9efb6508816ee918f7b9917 (patch)
treedaeb21e5a8b5e73da2c2a930269c3e1f385d7f11
parent6a550dc667295158c8bb01c6cb82ee5a4c97c182 (diff)
Fix test
-rw-r--r--CabalHelper/Main.hs1
-rw-r--r--Distribution/Helper.hs2
2 files changed, 2 insertions, 1 deletions
diff --git a/CabalHelper/Main.hs b/CabalHelper/Main.hs
index c0443e8..0177cf5 100644
--- a/CabalHelper/Main.hs
+++ b/CabalHelper/Main.hs
@@ -159,6 +159,7 @@ main = do
print =<< flip mapM cmds $$ \cmd -> do
case cmd of
"write-autogen-files":[] -> do
+ -- can't use @projdir@ here
let pd = localPkgDescr lbi
-- calls writeAutogenFiles
initialBuildSteps distdir pd lbi v
diff --git a/Distribution/Helper.hs b/Distribution/Helper.hs
index 05f5b3c..956f714 100644
--- a/Distribution/Helper.hs
+++ b/Distribution/Helper.hs
@@ -243,7 +243,7 @@ writeAutogenFiles :: MonadIO m
-> m ()
writeAutogenFiles distdir = liftIO $ do
exe <- findLibexecExe "cabal-helper-wrapper"
- void $ readProcess exe [distdir, "write-autogen-files"] ""
+ void $ readProcess exe ["/nowhere/../..", distdir, "write-autogen-files"] ""
-- | Get the path to the sandbox package-db in a project
getSandboxPkgDb :: FilePath