aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-05-24 09:13:24 +0200
committerDan Gudmundsson <[email protected]>2017-05-24 09:13:24 +0200
commitf2805093b6e4777739398ad7fae0499caace7daa (patch)
treea392da1e8dedce344ede83053e1f188f62ad11cc /erts
parentdfbd02122cb48900bf2953dedf5b10cb9a42ad89 (diff)
parent13f07042fd333c9bc137e142c4dc24b7d5cbe909 (diff)
downloadotp-f2805093b6e4777739398ad7fae0499caace7daa.tar.gz
otp-f2805093b6e4777739398ad7fae0499caace7daa.tar.bz2
otp-f2805093b6e4777739398ad7fae0499caace7daa.zip
Merge branch 'dgud/erts/revert-default-process-name'
* dgud/erts/revert-default-process-name: Revert setting default argv0 name
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 70520eea15..51ed2d0dff 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -555,7 +555,7 @@ int main(int argc, char **argv)
if(s) {
add_Eargs(s); /* argv[0] = scriptname*/
} else {
- add_Eargs(progname); /* argv[0] = erl or cerl */
+ add_Eargs(emu); /* argv[0] = erl or cerl */
}
/*
* Add the bindir to the path (unless it is there already).