Commit 5f8abc4b authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Clean up rules.

parent c677b049
......@@ -7,10 +7,10 @@ configRules :: Rules ()
configRules = do
configPath -/- "system.config" %> \out -> do
need [configPath -/- "system.config.in", "configure"]
putColoured White "Running configure..."
putBuild "Running configure..."
cmd "bash configure" -- TODO: get rid of 'bash'
"configure" %> \out -> do
copyFile' (configPath -/- "configure.ac") "configure.ac"
putColoured White $ "Running autoconf..."
putBuild "Running autoconf..."
cmd "bash autoconf" -- TODO: get rid of 'bash'
......@@ -26,7 +26,9 @@ buildPackageDependencies _ target =
(buildPath -/- "c.deps") %> \file -> do
srcs <- pkgDataList $ CSrcs path
deps <- forM srcs $ \src -> readFile' $ buildPath -/- src <.> "deps"
let depFiles = [ buildPath -/- src <.> "deps" | src <- srcs ]
need depFiles -- increase parallelism by needing all at once
deps <- mapM readFile' depFiles
writeFileChanged file (concat deps)
(buildPath -/- "haskell.deps") %> \file -> do
......
......@@ -64,7 +64,6 @@ putOracle = putColoured Blue
putBuild :: String -> Action ()
putBuild = putColoured White
-- A more colourful version of error
redError :: String -> Action a
redError msg = do
......
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