Commit 95b6614a authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Fix ordering of appends.

parent a1dd39f2
......@@ -45,7 +45,7 @@ instance Monoid a => Monoid (Expr a) where
mappend = liftM2 mappend
append :: Monoid a => a -> DiffExpr a
append x = return $ Endo (<> x)
append = return . Endo . mappend
appendM :: Monoid a => Action a -> DiffExpr a
appendM mx = lift mx >>= append
......
......@@ -148,9 +148,9 @@ buildPackageData env ways settings =
-- , "build" </> "autogen" </> ("Paths_" ++ name) <.> "hs"
] &%> \_ -> do
let configure = pkgPath pkg </> "configure"
need [pkgPath pkg </> pkgCabal pkg]
-- GhcCabal will run the configure script, so we depend on it
-- We still don't know who build the configure script from configure.ac
need [pkgPath pkg </> pkgCabal pkg]
-- We still don't know who built the configure script from configure.ac
when (doesFileExist $ configure <.> "ac") $ need [configure]
run' env GhcCabal settings
-- TODO: when (registerPackage settings) $
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment