From 79d21c0da06f7490e3e0667b94857e7a5a09ee11 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Tue, 16 Jan 2007 12:04:09 +0000 Subject: [PATCH] allow 'ghci -threaded' (fixes #1101) --- compiler/main/Main.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/main/Main.hs b/compiler/main/Main.hs index f7c5be7..09d8185 100644 --- a/compiler/main/Main.hs +++ b/compiler/main/Main.hs @@ -31,7 +31,7 @@ import Config ( cProjectVersion, cBooterVersion, cProjectName ) import Packages ( dumpPackages ) import DriverPhases ( Phase(..), isSourceFilename, anyHsc, startPhase, isHaskellSrcFilename ) -import StaticFlags ( staticFlags, v_Ld_inputs, parseStaticFlags ) +import StaticFlags import DynFlags ( defaultDynFlags ) import BasicTypes ( failed ) import ErrUtils ( putMsg ) @@ -213,9 +213,10 @@ checkOptions cli_mode dflags srcs objs = do when (notNull unknown_opts) (unknownFlagsErr unknown_opts) -- -prof and --interactive are not a good combination - when (notNull (wayNames dflags) && isInterpretiveMode cli_mode) $ + when (notNull (filter (/= WayThreaded) (wayNames dflags)) + && isInterpretiveMode cli_mode) $ do throwDyn (UsageError - "--interactive can't be used with -prof, -ticky, -unreg or -smp.") + "--interactive can't be used with -prof, -ticky, or -unreg.") -- -ohi sanity check if (isJust (outputHi dflags) && (isCompManagerMode cli_mode || srcs `lengthExceeds` 1)) -- 1.7.10.4