From a3c3997626264ebce9efb6508816ee918f7b9917 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Mon, 10 Aug 2015 09:14:00 +0200 Subject: Fix test --- CabalHelper/Main.hs | 1 + Distribution/Helper.hs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3