aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2009-11-30 13:32:57 +0000
committerErlang/OTP <otp@erlang.org>2009-11-30 13:32:57 +0000
commit7a75e61f847c0dd7a97e38b433fd15cedbb50860 (patch)
tree5738685582975e74a202e9c386a382b699e15e4d
parentffbceec1507f061c76f2c4533a7bfe23072ff1e9 (diff)
parent7acb13fdeeac3058337839c5c56b9a7f9f1964e8 (diff)
downloadotp-7a75e61f847c0dd7a97e38b433fd15cedbb50860.tar.gz
otp-7a75e61f847c0dd7a97e38b433fd15cedbb50860.tar.bz2
otp-7a75e61f847c0dd7a97e38b433fd15cedbb50860.zip
Merge branch 'ks/dialyzer-wx-fix' into ccase/r13b04_dev
* ks/dialyzer-wx-fix: dialyzer: make -wx always start the SMP emulator
-rw-r--r--erts/etc/common/dialyzer.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/erts/etc/common/dialyzer.c b/erts/etc/common/dialyzer.c
index 9c66be7f0f..4b4c1124f1 100644
--- a/erts/etc/common/dialyzer.c
+++ b/erts/etc/common/dialyzer.c
@@ -141,6 +141,7 @@ main(int argc, char** argv)
int eargc_base; /* How many arguments in the base of eargv. */
char* emulator;
char *env;
+ int i;
int need_shell = 0;
env = get_env("DIALYZER_EMULATOR");
@@ -167,9 +168,11 @@ main(int argc, char** argv)
* Push initial arguments.
*/
- if (argc > 1 && strcmp(argv[1], "--wx") == 0) {
- PUSH2("-smp", "--wx"); /* wx currently requires SMP enabled */
- argc--, argv++;
+ for (i = 1; i < argc; i++) {
+ if (strcmp(argv[i], "--wx") == 0) {
+ PUSH("-smp"); /* wx currently requires SMP enabled */
+ break;
+ }
}
if (argc > 1 && strcmp(argv[1], "-smp") == 0) {