diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2017-11-19 12:04:26 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-11-19 12:04:26 -0700 |
| commit | 05e5308ee7cef99b24b4f9d9755e5488f8d92a39 (patch) | |
| tree | 256b8f20bddf0f0701a3247228f9c2dd77be6e64 /src/Propellor/Bootstrap.hs | |
| parent | 38d039310e4db6ffaf5c8ca51c339421e6865eff (diff) | |
| parent | 12beba0367d14f9c52adf72dd36e9cf5a8e35761 (diff) | |
Merge branch 'master' of https://git.joeyh.name/git/propellor into sbuild-overhaul
Diffstat (limited to 'src/Propellor/Bootstrap.hs')
| -rw-r--r-- | src/Propellor/Bootstrap.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index 170c85d6..04f23f85 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -80,7 +80,7 @@ buildCommand bs = intercalate " && " (go (getBuilder bs)) where go Cabal = [ "cabal configure" - , "cabal build propellor-config" + , "cabal build -j1 propellor-config" , "ln -sf dist/build/propellor-config/propellor-config propellor" ] go Stack = @@ -280,7 +280,9 @@ cabalBuild msys = do boolSystem "sh" [Param "-c", Param (depsCommand (Robustly Cabal) (Just sys))] <&&> cabal ["configure"] ) - cabal_build = cabal ["build", "propellor-config"] + -- The -j1 is to only run one job at a time -- in some situations, + -- eg in qemu, ghc does not run reliably in parallel. + cabal_build = cabal ["build", "-j1", "propellor-config"] stackBuild :: Maybe System -> IO Bool stackBuild _msys = do |