Commit df2bcd8a authored by ian@well-typed.com's avatar ian@well-typed.com

Set the default way correctly when dynamic-by-default

parent c67b4313
......@@ -66,6 +66,7 @@ module DynFlags (
-- ** Manipulating DynFlags
defaultDynFlags, -- Settings -> DynFlags
defaultWays,
initDynFlags, -- DynFlags -> IO DynFlags
defaultFatalMessager,
defaultLogAction,
......@@ -1183,9 +1184,9 @@ defaultDynFlags mySettings =
packageFlags = [],
pkgDatabase = Nothing,
pkgState = panic "no package state yet: call GHC.setSessionDynFlags",
ways = [],
buildTag = mkBuildTag [],
rtsBuildTag = mkBuildTag [],
ways = defaultWays mySettings,
buildTag = mkBuildTag (defaultWays mySettings),
rtsBuildTag = mkBuildTag (defaultWays mySettings),
splitInfo = Nothing,
settings = mySettings,
-- ghc -M values
......@@ -1240,6 +1241,11 @@ defaultDynFlags mySettings =
interactivePrint = Nothing
}
defaultWays :: Settings -> [Way]
defaultWays settings = if pc_dYNAMIC_BY_DEFAULT (sPlatformConstants settings)
then [WayDyn]
else []
--------------------------------------------------------------------------
type FatalMessager = String -> IO ()
......
......@@ -292,7 +292,7 @@ checkOptions mode dflags srcs objs = do
hPutStrLn stderr ("Warning: -debug, -threaded and -ticky are ignored by GHCi")
-- -prof and --interactive are not a good combination
when (notNull (filter (not . wayRTSOnly) (ways dflags))
when ((filter (not . wayRTSOnly) (ways dflags) /= defaultWays (settings dflags))
&& isInterpretiveMode mode) $
do ghcError (UsageError
"--interactive can't be used with -prof or -unreg.")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment