diff options
| author | Sverker Eriksson <[email protected]> | 2018-06-28 17:52:45 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-06-28 17:52:45 +0200 |
| commit | 58e8c0d4d19532f26b592eb00154044a4a86629d (patch) | |
| tree | 387e5f2cf52464e977ce2231771c21219ce8272b /erts/etc | |
| parent | 431ba3068937350bfa21cc274ab06c2fc36b739e (diff) | |
| parent | 2134c4fa0b2eb7d227295aed166d344dcf022d21 (diff) | |
| download | otp-58e8c0d4d19532f26b592eb00154044a4a86629d.tar.gz otp-58e8c0d4d19532f26b592eb00154044a4a86629d.tar.bz2 otp-58e8c0d4d19532f26b592eb00154044a4a86629d.zip | |
Merge branch 'sverker/cerl-fixing' into maint
* sverker/cerl-fixing:
erts: Remove "-pz $PRELOADED" arguments added by cerl
erts: Remove dead code in cerl script
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/unix/cerl.src | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src index 3572fdd954..896e4c8e45 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= @@ -97,8 +88,6 @@ TARGET=%TARGET% PROGNAME=$ROOTDIR/bin/cerl EMU=beam -PRELOADED=$ROOTDIR/erts/preloaded/ebin - while [ $# -gt 0 ]; do case "$1" in @@ -255,7 +244,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"` @@ -269,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 @@ -316,12 +303,12 @@ 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 $eeargs $xargs ${1+"$@"} + exec $EXEC $xargs ${1+"$@"} fi elif [ "x$GDB" = "xgdb" ]; then case "x$core" in |