aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-11-16 13:23:06 +0100
committerHenrik Nord <[email protected]>2015-11-16 13:23:06 +0100
commitdc61e819e190ae65b69fbb013511b25023f713ff (patch)
tree25485d0ca995e1b91a8716dd0e6e89fe27948dab /erts
parent01ecb1cd777b82259bb29824ac73906831c017fe (diff)
parentfb1c22169c96b51f331c0e7885cdbd0806585da2 (diff)
downloadotp-dc61e819e190ae65b69fbb013511b25023f713ff.tar.gz
otp-dc61e819e190ae65b69fbb013511b25023f713ff.tar.bz2
otp-dc61e819e190ae65b69fbb013511b25023f713ff.zip
Merge branch 'legoscia/erl-make-exit-code' into maint
* legoscia/erl-make-exit-code: Make erl -make return non-zero exit code on failure OTP-13107
Diffstat (limited to 'erts')
-rw-r--r--erts/etc/common/erlexec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index cde0b25a2a..1e7c56dd8e 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -718,7 +718,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 */