diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-02-04 21:49:05 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-02-06 11:53:31 -0500 |
| commit | bf8ba2525e95319bdbcfc81d06448b646eba3a57 (patch) | |
| tree | 83aac2bf137fccb8ae49916da9265b7b7fd41833 /haddock-api/src/Haddock.hs | |
| parent | e1230ede3d1c77a6916e318aefcd47829e56035c (diff) | |
| parent | 1bdbf284b4ba20ee1738b13c4e3414384955f6f3 (diff) | |
Merge remote-tracking branch 'origin/ghc-head' into wip/ghc-head-merge
Diffstat (limited to 'haddock-api/src/Haddock.hs')
| -rw-r--r-- | haddock-api/src/Haddock.hs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/haddock-api/src/Haddock.hs b/haddock-api/src/Haddock.hs index 8c549304..2b6e2d57 100644 --- a/haddock-api/src/Haddock.hs +++ b/haddock-api/src/Haddock.hs @@ -153,12 +153,17 @@ haddockWithGhc ghc args = handleTopExceptions $ do sinceQual <- rightOrThrowE (sinceQualification flags) -- inject dynamic-too into flags before we proceed - flags' <- ghc flags $ do + flags'' <- ghc flags $ do df <- getDynFlags case lookup "GHC Dynamic" (compilerInfo df) of Just "YES" -> return $ Flag_OptGhc "-dynamic-too" : flags _ -> return flags + flags' <- pure $ case optParCount flags'' of + Nothing -> flags'' + Just Nothing -> Flag_OptGhc "-j" : flags'' + Just (Just n) -> Flag_OptGhc ("-j" ++ show n) : flags'' + -- bypass the interface version check let noChecks = Flag_BypassInterfaceVersonCheck `elem` flags |