Commit 72cbd440 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Show output of boot and configure.

See #234.
parent 658d373c
......@@ -62,7 +62,7 @@ customBuild rs opts target@Target {..} = do
need [dir -/- "configure"]
-- Inject /bin/bash into `libtool`, instead of /bin/sh
let env = AddEnv "CONFIG_SHELL" "/bin/bash"
cmd Shell (EchoStdout False) [Cwd dir] [path] (env:opts) argList
cmd Shell [Cwd dir] [path] (env:opts) argList
HsCpp -> captureStdout target path argList
GenApply -> captureStdout target path argList
......
module Rules.Configure (configureRules) where
import qualified System.Info
import qualified System.Info as System
import Base
import Builder
......@@ -22,12 +22,9 @@ configureRules = do
++ "--skip-configure flag."
else do
-- We cannot use windowsHost here due to a cyclic dependency.
when (System.Info.os == "mingw32") $ do
when (System.os == "mingw32") $ do
putBuild "| Checking for Windows tarballs..."
quietly $ cmd [ "bash"
, "mk/get-win32-tarballs.sh"
, "download"
, System.Info.arch ]
quietly $ cmd ["bash mk/get-win32-tarballs.sh download", System.arch]
let srcs = map (<.> "in") outs
context = vanillaContext Stage0 compiler
need srcs
......@@ -41,4 +38,4 @@ configureRules = do
else do
need ["configure.ac"]
putBuild "| Running boot..."
quietly $ cmd (EchoStdout False) "perl boot"
quietly $ cmd "perl boot"
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