diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-04-12 13:21:41 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-04-12 14:21:37 +0100 |
| commit | 5463b55b7dadc1e9918edb2d8666bf3ed195bc61 (patch) | |
| tree | 9738714d517d56166a90a6eb18decb34fcf9d406 /compiler | |
| parent | 4f018b471c7c5db858beb508b8430ae4d0621173 (diff) | |
| download | haskell-5463b55b7dadc1e9918edb2d8666bf3ed195bc61.tar.gz | |
Cleanup sweep and fix a bug in RTS flag processing.
This code has accumulated a great deal of cruft over the years, this
pass cleans up a lot of the surrounding cruft but leaves the actual
argument processing alone - so there's still more that could be done.
Bug fixed:
- ghc_rts_opts should not be subject to the --rtsopts setting. If
the programmer explicitly declares options with ghc_rts_opts, they
shouldn't also have to accept command-line RTS options to make them
work.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index bc16ede088..d7d6ae331d 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1420,13 +1420,13 @@ mkExtraObjToLinkIntoBinary dflags dep_packages = do mk_rts_opts_enabled val = vcat [text "#include \"Rts.h\"", text "#include \"RtsOpts.h\"", - text "const rtsOptsEnabledEnum rtsOptsEnabled = " <> + text "const RtsOptsEnabledEnum rtsOptsEnabled = " <> text val <> semi ] rts_opts_enabled = case rtsOptsEnabled dflags of - RtsOptsNone -> mk_rts_opts_enabled "rtsOptsNone" + RtsOptsNone -> mk_rts_opts_enabled "RtsOptsNone" RtsOptsSafeOnly -> empty -- The default - RtsOptsAll -> mk_rts_opts_enabled "rtsOptsAll" + RtsOptsAll -> mk_rts_opts_enabled "RtsOptsAll" extra_rts_opts = case rtsOpts dflags of Nothing -> empty |