diff options
| author | John Ericson <git@JohnEricson.me> | 2019-09-10 00:15:48 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-10-05 00:11:58 -0400 |
| commit | ee8118caf12526456c619e17cbc0f729c6cd2391 (patch) | |
| tree | 01c437c7e588987f35494e24c98aaa9260251f03 /compiler/main/CodeOutput.hs | |
| parent | 8039b6257ce5288e9e38c2593ff2d5d6d316efd4 (diff) | |
| download | haskell-ee8118caf12526456c619e17cbc0f729c6cd2391.tar.gz | |
Clean up `#include`s in the compiler
- Remove unneeded ones
- Use <..> for inter-package.
Besides general clean up, helps distinguish between the RTS we link
against vs the RTS we compile for.
Diffstat (limited to 'compiler/main/CodeOutput.hs')
| -rw-r--r-- | compiler/main/CodeOutput.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/main/CodeOutput.hs b/compiler/main/CodeOutput.hs index 4109e50c02..96a754d6f0 100644 --- a/compiler/main/CodeOutput.hs +++ b/compiler/main/CodeOutput.hs @@ -224,12 +224,12 @@ outputForeignStubs dflags mod location stubs -- wrapper code mentions the ffi_arg type, which comes from ffi.h ffi_includes - | platformMisc_libFFI $ platformMisc dflags = "#include \"ffi.h\"\n" + | platformMisc_libFFI $ platformMisc dflags = "#include <ffi.h>\n" | otherwise = "" stub_h_file_exists <- outputForeignStubs_help stub_h stub_h_output_w - ("#include \"HsFFI.h\"\n" ++ cplusplus_hdr) cplusplus_ftr + ("#include <HsFFI.h>\n" ++ cplusplus_hdr) cplusplus_ftr dumpIfSet_dyn dflags Opt_D_dump_foreign "Foreign export stubs" stub_c_output_d @@ -237,7 +237,7 @@ outputForeignStubs dflags mod location stubs stub_c_file_exists <- outputForeignStubs_help stub_c stub_c_output_w ("#define IN_STG_CODE 0\n" ++ - "#include \"Rts.h\"\n" ++ + "#include <Rts.h>\n" ++ rts_includes ++ ffi_includes ++ cplusplus_hdr) |