summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2022-05-09 17:39:00 +0100
committerBen Gamari <ben@smart-cactus.org>2022-05-18 11:16:59 -0400
commita3d8ccd7383c32a8944b327f16cd30a253426b79 (patch)
tree86d1e67aab17bba1aba522b315d52fb8241ea73a
parent9ddda31cd3a208411c642d8c081207718782f80c (diff)
downloadhaskell-a3d8ccd7383c32a8944b327f16cd30a253426b79.tar.gz
hadrian: Don't pass -j to haddock
This has high potential for oversubcribing as many haddock jobs can be spawned in parralel which will each request the given number of capabilities. Once -jsem is implemented (#19416, !5176) we can expose that haddock via haddock and use that to pass a semaphore. Ticket #21136 (cherry picked from commit 9d8f44a98f8345e5223614e0de50fbef2a05dd1d)
-rw-r--r--hadrian/src/Settings/Builders/Haddock.hs4
1 files changed, 1 insertions, 3 deletions
diff --git a/hadrian/src/Settings/Builders/Haddock.hs b/hadrian/src/Settings/Builders/Haddock.hs
index 6dc4dbde68..5d76b7ee1e 100644
--- a/hadrian/src/Settings/Builders/Haddock.hs
+++ b/hadrian/src/Settings/Builders/Haddock.hs
@@ -43,10 +43,8 @@ haddockBuilderArgs = mconcat
hVersion <- expr $ pkgVersion haddock
statsDir <- expr $ haddockStatsFilesDir
ghcOpts <- haddockGhcArgs
- threads <- shakeThreads <$> expr getShakeOptions
mconcat
- [ arg $ "-j" ++ (show threads)
- , arg "--verbosity=0"
+ [ arg "--verbosity=0"
, arg $ "-B" ++ root -/- stageString Stage1 -/- "lib"
, arg $ "--lib=" ++ root -/- stageString Stage1 -/- "lib"
, arg $ "--odir=" ++ takeDirectory output