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/ghci | |
| 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/ghci')
| -rw-r--r-- | compiler/ghci/Linker.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs index 636e7c35de..077b067c3c 100644 --- a/compiler/ghci/Linker.hs +++ b/compiler/ghci/Linker.hs @@ -343,7 +343,7 @@ linkCmdLineLibs' hsc_env pls = -- Add directories to library search paths, this only has an effect -- on Windows. On Unix OSes this function is a NOP. - let all_paths = let paths = takeDirectory (fst $ sPgm_c $ settings dflags) + let all_paths = let paths = takeDirectory (fst $ pgm_c dflags) : framework_paths ++ lib_paths_base ++ [ takeDirectory dll | DLLPath dll <- libspecs ] |