diff options
| author | John Ericson <git@JohnEricson.me> | 2019-05-21 23:00:27 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-05-29 16:06:45 -0400 |
| commit | bfccd832782353a000b430870a6602cc591c8b7a (patch) | |
| tree | 499d224a8aa6f8adb5dc2b726f7726b6409b8c41 /compiler/main/SysTools.hs | |
| parent | ace2e3350fa7da1f7ebcdb882f1241da10a90c26 (diff) | |
| download | haskell-bfccd832782353a000b430870a6602cc591c8b7a.tar.gz | |
Inline `Settings` into `DynFlags`
After the previous commit, `Settings` is just a thin wrapper around
other groups of settings. While `Settings` is used by GHC-the-executable
to initalize `DynFlags`, in principle another consumer of
GHC-the-library could initialize `DynFlags` a different way. It
therefore doesn't make sense for `DynFlags` itself (library code) to
separate the settings that typically come from `Settings` from the
settings that typically don't.
Diffstat (limited to 'compiler/main/SysTools.hs')
| -rw-r--r-- | compiler/main/SysTools.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs index 763477a1c9..2899ba383d 100644 --- a/compiler/main/SysTools.hs +++ b/compiler/main/SysTools.hs @@ -433,10 +433,10 @@ linkDynLib dflags0 o_files dep_packages -- against libHSrts, then both end up getting loaded, -- and things go wrong. We therefore link the libraries -- with the same RTS flags that we link GHC with. - dflags1 = if sGhcThreaded $ settings dflags0 + dflags1 = if platformMisc_ghcThreaded $ platformMisc dflags0 then addWay' WayThreaded dflags0 else dflags0 - dflags2 = if sGhcDebugged $ settings dflags1 + dflags2 = if platformMisc_ghcDebugged $ platformMisc dflags1 then addWay' WayDebug dflags1 else dflags1 dflags = updateWays dflags2 |