Commit 507f48d1 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Minor revision.

parent 0678acb6
......@@ -106,17 +106,16 @@ runConfigure dir opts args = do
need [dir -/- "configure"]
let args' = filter (not . null) args
note = if null args' then "" else " (" ++ intercalate ", " args' ++ ")"
-- Always configure with bash.
-- This also injects /bin/bash into `libtool`, instead of /bin/sh
opts' = opts ++ [AddEnv "CONFIG_SHELL" "/bin/bash"]
if dir == "."
then do
putBuild $ "| Run configure" ++ note ++ "..."
quietly $ cmd Shell (EchoStdout False) "bash configure" opts' args
quietly $ cmd Shell (EchoStdout False) "bash configure" opts' args'
else do
putBuild $ "| Run configure" ++ note ++ " in " ++ dir ++ "..."
quietly $ cmd Shell (EchoStdout False) [Cwd dir] "bash configure" opts' args
where
-- Always configure with bash.
-- This also injects /bin/bash into `libtool`, instead of /bin/sh
opts' = opts ++ [AddEnv "CONFIG_SHELL" "/bin/bash"]
quietly $ cmd Shell (EchoStdout False) [Cwd dir] "bash configure" opts' args'
runMake :: FilePath -> [String] -> Action ()
runMake = runMakeWithVerbosity False
......
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