diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-12-16 11:44:52 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-12-16 11:44:52 +0000 |
| commit | 890f22ef8eff8dbb5b31fa221dfce65a7b84c202 (patch) | |
| tree | 4e354a6203defe640c0150d66dda6da063726ef5 /rts/RtsFlags.c | |
| parent | 05859437c5dfd2967418e3267f7cfc37e4f8952d (diff) | |
| download | haskell-890f22ef8eff8dbb5b31fa221dfce65a7b84c202.tar.gz | |
fix #3910
Diffstat (limited to 'rts/RtsFlags.c')
| -rw-r--r-- | rts/RtsFlags.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c index b0dd42b38c..067986f6d2 100644 --- a/rts/RtsFlags.c +++ b/rts/RtsFlags.c @@ -454,16 +454,9 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]) mode = PGM; } else if (mode == RTS && *rts_argc < MAX_RTS_ARGS-1) { - if ((rtsOptsEnabled == rtsOptsAll) || - strequal(argv[arg], "--info")) { rts_argv[(*rts_argc)++] = argv[arg]; } - else { - errorBelch("Most RTS options are disabled. Link with -rtsopts to enable them."); - stg_exit(EXIT_FAILURE); - } - } - else if (mode == PGM) { + else if (mode == PGM) { argv[(*argc)++] = argv[arg]; } else { @@ -485,7 +478,25 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]) error = rtsTrue; } else { - switch(rts_argv[arg][1]) { + + switch(rts_argv[arg][1]) { + case '-': + if (strequal("info", &rts_argv[arg][2])) { + printRtsInfo(); + stg_exit(0); + } + break; + default: + break; + } + + if (rtsOptsEnabled != rtsOptsAll) + { + errorBelch("Most RTS options are disabled. Link with -rtsopts to enable them."); + stg_exit(EXIT_FAILURE); + } + + switch(rts_argv[arg][1]) { /* process: general args, then PROFILING-only ones, then CONCURRENT-only, TICKY-only (same order as defined in |