summaryrefslogtreecommitdiff
path: root/ghc
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-09-01 18:18:15 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-10-09 08:42:31 -0400
commitaccdb24a086b80fe74776246aa33bce5a920e3c8 (patch)
tree1204e3b93332d6f54d2b5f71cc2794bdc9bd4a2d /ghc
parentfd984d68e5ec4b04bc79395c099434e653eb1060 (diff)
downloadhaskell-accdb24a086b80fe74776246aa33bce5a920e3c8.tar.gz
Expose RTS-only ways (#18651)
Some RTS ways are exposed via settings (ghcThreaded, ghcDebugged) but not all. It's simpler if the RTS exposes them all itself.
Diffstat (limited to 'ghc')
-rw-r--r--ghc/Main.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 06a26c45ae..122e4dce0c 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -348,12 +348,12 @@ checkOptions mode dflags srcs objs = do
let unknown_opts = [ f | (f@('-':_), _) <- srcs ]
when (notNull unknown_opts) (unknownFlagsErr unknown_opts)
- when (not (Set.null (Set.filter wayRTSOnly (ways dflags)))
+ when (not (Set.null (rtsWays (ways dflags)))
&& isInterpretiveMode mode) $
hPutStrLn stderr ("Warning: -debug, -threaded and -ticky are ignored by GHCi")
-- -prof and --interactive are not a good combination
- when ((Set.filter (not . wayRTSOnly) (ways dflags) /= hostFullWays)
+ when ((fullWays (ways dflags) /= hostFullWays)
&& isInterpretiveMode mode
&& not (gopt Opt_ExternalInterpreter dflags)) $
do throwGhcException (UsageError