summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schulze Frielinghaus <stefansf@linux.ibm.com>2020-07-08 09:26:35 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-07-13 09:01:10 -0400
commitc3ac87ece2716b83ad886e81c20f4161e8ec0efd (patch)
treedf68efa135b4d5cced75c39738716a4caabd35b4
parentc2cfdfde20d0d6c0e16aa7a84d8ebe51501bcfa8 (diff)
downloadhaskell-c3ac87ece2716b83ad886e81c20f4161e8ec0efd.tar.gz
hadrian: build check-ppr dynamic if GHC is build dynamic
Fixes #18361
-rw-r--r--hadrian/src/Rules/Test.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/hadrian/src/Rules/Test.hs b/hadrian/src/Rules/Test.hs
index 2104e3312b..b1e328368f 100644
--- a/hadrian/src/Rules/Test.hs
+++ b/hadrian/src/Rules/Test.hs
@@ -75,13 +75,16 @@ testRules = do
bindir <- getBinaryDirectory testGhc
debugged <- ghcDebugged <$> flavour
+ dynPrograms <- dynamicGhcPrograms =<< flavour
cmd [bindir </> "ghc" <.> exe] $
concatMap (\p -> ["-package", pkgName p]) depsPkgs ++
["-o", top -/- path, top -/- sourcePath] ++
-- If GHC is build with debug options, then build check-ppr
-- also with debug options. This allows, e.g., to print debug
-- messages of various RTS subsystems while using check-ppr.
- if debugged then ["-debug"] else []
+ if debugged then ["-debug"] else [] ++
+ -- If GHC is build dynamic, then build check-ppr also dynamic.
+ if dynPrograms then ["-dynamic"] else []
root -/- ghcConfigPath %> \_ -> do
args <- userSetting defaultTestArgs