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/CodeOutput.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/CodeOutput.hs')
| -rw-r--r-- | compiler/main/CodeOutput.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/main/CodeOutput.hs b/compiler/main/CodeOutput.hs index 1ded72111a..050e6f5c14 100644 --- a/compiler/main/CodeOutput.hs +++ b/compiler/main/CodeOutput.hs @@ -155,7 +155,7 @@ outputAsm :: DynFlags -> Module -> ModLocation -> FilePath -> Stream IO RawCmmGroup () -> IO () outputAsm dflags this_mod location filenm cmm_stream - | sGhcWithNativeCodeGen $ settings dflags + | platformMisc_ghcWithNativeCodeGen $ platformMisc dflags = do ncg_uniqs <- mkSplitUniqSupply 'n' debugTraceMsg dflags 4 (text "Outputing asm to" <+> text filenm) @@ -226,7 +226,7 @@ outputForeignStubs dflags mod location stubs -- wrapper code mentions the ffi_arg type, which comes from ffi.h ffi_includes - | sLibFFI $ settings dflags = "#include \"ffi.h\"\n" + | platformMisc_libFFI $ platformMisc dflags = "#include \"ffi.h\"\n" | otherwise = "" stub_h_file_exists |