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 /rts/RtsStartup.c | |
| 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 'rts/RtsStartup.c')
| -rw-r--r-- | rts/RtsStartup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c index 266c04808d..b860667fe4 100644 --- a/rts/RtsStartup.c +++ b/rts/RtsStartup.c @@ -16,6 +16,7 @@ #include "HsFFI.h" #include "sm/Storage.h" +#include "RtsFlags.h" #include "RtsUtils.h" #include "Prelude.h" #include "Schedule.h" /* initScheduler */ @@ -129,8 +130,7 @@ hs_init(int *argc, char **argv[]) /* Parse the flags, separating the RTS flags from the programs args */ if (argc != NULL && argv != NULL) { setFullProgArgv(*argc,*argv); - setupRtsFlags(argc, *argv, &rts_argc, rts_argv); - setProgArgv(*argc,*argv); + setupRtsFlags(argc, *argv); } /* Initialise the stats department, phase 1 */ |