From 1608bd99eb894d06027c56c9ceb3d08573401066 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Fri, 30 Oct 2015 15:06:15 +0100 Subject: [PATCH] build.sh: Use shell built-in command trace Rather than issuing echo "cmd..." then cmd... itself, we enable shell trace facility via set -x, which is POSIX shell standard command and is compatible with all UNIX shells. This effectively cuts build.sh size twice, since we don't need to double stuff there, also making it human readable. We are also setting PS4 (trace prefix) to none, instead final echo "SUCCESS", we issue : SUCCESS command which outputs its contents in trace. --- tools/niminst/buildsh.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/niminst/buildsh.tmpl b/tools/niminst/buildsh.tmpl index 463a1ad52..0037a0a20 100644 --- a/tools/niminst/buildsh.tmpl +++ b/tools/niminst/buildsh.tmpl @@ -31,6 +31,7 @@ CC="gcc" LINKER="gcc" COMP_FLAGS="?{c.ccompiler.flags}$extraBuildArgs" LINK_FLAGS="?{c.linker.flags}" +PS4="" # add(result, "# platform detection\n") ucpu=`uname -m` uos=`uname` @@ -131,14 +132,13 @@ case $myos in case $mycpu in # for cpuA in 1..c.cpus.len: ?{c.cpus[cpuA-1]}) + set -x # var linkCmd = "" # for ff in items(c.cfiles[osA][cpuA]): # let f = ff.toUnix - echo "$CC $COMP_FLAGS -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")}" $CC $COMP_FLAGS -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")} # add(linkCmd, " \\\n" & changeFileExt(f, "o")) # end for - echo "$LINKER -o ?{"$binDir/" & toLower(c.name)} ?linkCmd $LINK_FLAGS" $LINKER -o ?{"$binDir/" & toLower(c.name)} ?linkCmd $LINK_FLAGS ;; # end for @@ -155,4 +155,4 @@ case $myos in ;; esac -echo "SUCCESS" +: SUCCESS