diff options
author | Henrik Nord <[email protected]> | 2015-11-16 13:25:03 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2015-11-16 13:25:03 +0100 |
commit | 828867abc55c64f61dd4c0e67dc4e0ad5becf4dc (patch) | |
tree | ef60e70964237923af6593eaddbecedeb060e250 /erts/etc/common/erlexec.c | |
parent | b1c85b4310d7b33ddcc6c121a95db1c12a83a882 (diff) | |
parent | c16c45a587a199987dae799ea02fb9c32216854f (diff) | |
download | otp-828867abc55c64f61dd4c0e67dc4e0ad5becf4dc.tar.gz otp-828867abc55c64f61dd4c0e67dc4e0ad5becf4dc.tar.bz2 otp-828867abc55c64f61dd4c0e67dc4e0ad5becf4dc.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/etc/common/erlexec.c')
-rw-r--r-- | erts/etc/common/erlexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index 461957be10..c9f5fd66a1 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -724,7 +724,7 @@ int main(int argc, char **argv) * on itself here. We'll avoid doing that. */ if (strcmp(argv[i], "-make") == 0) { - add_args("-noshell", "-noinput", "-s", "make", "all", NULL); + add_args("-noshell", "-noinput", "-s", "make", "all_or_nothing", NULL); add_Eargs("-B"); haltAfterwards = 1; i = argc; /* Skip rest of command line */ |