Commit 06c15915 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Make initSysTools use the dflags it is passed, rather than defaultDynFlags

parent 2b6e4da6
......@@ -351,8 +351,8 @@ newSession mb_top_dir = do
installSignalHandlers
initStaticOpts
dflags0 <- initSysTools mb_top_dir defaultDynFlags
dflags <- initDynFlags dflags0
dflags0 <- initDynFlags defaultDynFlags
dflags <- initSysTools mb_top_dir dflags0
env <- newHscEnv dflags
ref <- newIORef env
return (Session ref)
......
......@@ -149,7 +149,7 @@ initSysTools :: Maybe String -- Maybe TopDir path (without the '-B' prefix)
-- (c) the GHC usage message
initSysTools mbMinusB _
initSysTools mbMinusB dflags0
= do { (am_installed, top_dir) <- findTopDir mbMinusB
-- top_dir
-- for "installed" this is the root of GHC's support files
......@@ -193,8 +193,6 @@ initSysTools mbMinusB _
| am_installed = installed_bin "bin/windres"
| otherwise = "windres"
; let dflags0 = defaultDynFlags
; tmpdir <- getTemporaryDirectory
; let dflags1 = setTmpDir tmpdir dflags0
......
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