From cefb0d82743d908af1d7933feb8f2ea59c6a0ec3 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Fri, 8 Jun 2018 15:22:09 +0200
Subject: erts: Remove dead code in cerl script

---
 erts/etc/unix/cerl.src | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'erts/etc/unix/cerl.src')

diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src
index 9dd8d85abe..4eeb6ba8c3 100644
--- a/erts/etc/unix/cerl.src
+++ b/erts/etc/unix/cerl.src
@@ -69,15 +69,6 @@ cxargs_add() {
     done
 }
 
-eeargs=
-eeargs_add() {
-    while [ $# -gt 0 ]; do
-	cargs="$cargs $1"
-	eeargs="$eeargs $1"
-	shift
-    done
-}
-
 core=
 
 GDB=
@@ -255,7 +246,7 @@ EXEC=$BINDIR/erlexec
 
 PROGNAME="$PROGNAME$cargs"
 EMU="$EMU$TYPE"
-EMU_NAME=`$EXEC -emu_name_exit $eeargs`
+EMU_NAME=`$EXEC -emu_name_exit`
 
 if [ $skip_erlexec = yes ]; then
     emu_xargs=`echo $xargs | sed "s|+|-|g"`
@@ -321,7 +312,7 @@ if [ "x$GDB" = "x" ]; then
     elif [ $run_rr = yes ]; then
 	exec rr record --ignore-nested $BINDIR/$EMU_NAME $emu_xargs "$@" -pz $PRELOADED
     else
-	exec $EXEC $eeargs $xargs ${1+"$@"}
+	exec $EXEC $xargs ${1+"$@"}
     fi
 elif [ "x$GDB" = "xgdb" ]; then
     case "x$core" in
-- 
cgit v1.2.3


From 2134c4fa0b2eb7d227295aed166d344dcf022d21 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Fri, 8 Jun 2018 15:26:48 +0200
Subject: erts: Remove "-pz $PRELOADED" arguments added by cerl

It caused problems when starting with -rr and other arguments.

Not sure what purpose it served
as -pz $PRELOADED is not passed by default by "erl".
---
 erts/etc/unix/cerl.src | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'erts/etc/unix/cerl.src')

diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src
index 4eeb6ba8c3..bbdd6b3784 100644
--- a/erts/etc/unix/cerl.src
+++ b/erts/etc/unix/cerl.src
@@ -88,8 +88,6 @@ TARGET=%TARGET%
 PROGNAME=$ROOTDIR/bin/cerl
 EMU=beam
 
-PRELOADED=$ROOTDIR/erts/preloaded/ebin
-
 
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -260,8 +258,6 @@ if [ $skip_erlexec = yes ]; then
 '
     set -- $beam_args
     IFS="$SAVE_IFS"
-else
-    xargs="$xargs -pz $PRELOADED --"
 fi
 if [ "x$GDB" = "x" ]; then
     if [ $run_valgrind = yes ]; then
@@ -307,10 +303,10 @@ if [ "x$GDB" = "x" ]; then
 	    sched_arg=
 	fi
 
-	exec $taskset1 valgrind $valgrind_xml $valgrind_log $valgrind_misc_flags $BINDIR/$EMU_NAME $sched_arg $emu_xargs "$@" -pz $PRELOADED
+	exec $taskset1 valgrind $valgrind_xml $valgrind_log $valgrind_misc_flags $BINDIR/$EMU_NAME $sched_arg $emu_xargs "$@"
 
     elif [ $run_rr = yes ]; then
-	exec rr record --ignore-nested $BINDIR/$EMU_NAME $emu_xargs "$@" -pz $PRELOADED
+	exec rr record --ignore-nested $BINDIR/$EMU_NAME $emu_xargs "$@"
     else
 	exec $EXEC $xargs ${1+"$@"}
     fi
-- 
cgit v1.2.3