File 0790-erts-Fix-erlexec-to-not-append-to-args-if-no-env-fla.patch of Package erlang
From 9c113f4deeb7dc1ee02cd58003782e1d70edad56 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Thu, 10 Oct 2019 14:00:35 +0200
Subject: [PATCH] erts: Fix erlexec to not append -- to args if no env flags
are set
Not having this broke: `erl -man erl`
---
erts/etc/common/erlexec.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 477a501876..a7f9ad2a33 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -1786,8 +1786,8 @@ done:
return NULL;
}
argv[argc++] = "--"; /* Add a -- separator in order
- for different from different environments
- to effect each other */
+ for flags from different environments
+ to not effect each other */
argv[argc++] = NULL; /* Sure to be large enough */
return argv;
#undef ENSURE
@@ -2077,7 +2077,7 @@ initial_argv_massage(int *argc, char ***argv)
if (av)
avv[vix++].argv = av;
- if (vix == (*argc > 1 ? 1 : 0)) {
+ if (vix == (*argc > 1 ? 2 : 0)) {
/* Only command line argv; check if we can use argv as it is... */
ac = *argc;
av = *argv;
--
2.16.4