jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3501 from nanoant/patch/smaller-build.sh-using-trace

Browse source 
Patch/smaller build.sh using trace
This commit is contained in:
Andreas Rumpf 2015-10-30 21:06:34 +01:00
commit f3814be530
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tools/niminst/buildsh.tmpl
View file

@ -18,7 +18,7 @@ do
break; break;
;; ;;
-*) -*)
echo "Error: Unknown option: $1" >&2 echo 2>&1 "Error: Unknown option: $1" >&2
exit 1 exit 1
;; ;;
*) # No more options *) # No more options
@ -31,6 +31,7 @@ CC="gcc"
LINKER="gcc" LINKER="gcc"
COMP_FLAGS="?{c.ccompiler.flags}$extraBuildArgs" COMP_FLAGS="?{c.ccompiler.flags}$extraBuildArgs"
LINK_FLAGS="?{c.linker.flags}" LINK_FLAGS="?{c.linker.flags}"
PS4=""
# add(result, "# platform detection\n") # add(result, "# platform detection\n")
ucpu=`uname -m` ucpu=`uname -m`
uos=`uname` uos=`uname`
@ -93,7 +94,7 @@ case $uos in
myos="haiku" myos="haiku"
;; ;;
*) *)
echo "Error: unknown operating system: $uos" echo 2>&1 "Error: unknown operating system: $uos"
exit 1 exit 1
;; ;;
esac esac
@ -118,7 +119,7 @@ case $ucpu in
*arm*|*armv6l* ) *arm*|*armv6l* )
mycpu="arm" ;; mycpu="arm" ;;
*) *)
echo "Error: unknown processor: $ucpu" echo 2>&1 "Error: unknown processor: $ucpu"
exit 1 exit 1
;; ;;
esac esac
@ -131,28 +132,27 @@ case $myos in
case $mycpu in case $mycpu in
# for cpuA in 1..c.cpus.len: # for cpuA in 1..c.cpus.len:
?{c.cpus[cpuA-1]}) ?{c.cpus[cpuA-1]})
set -x
# var linkCmd = "" # var linkCmd = ""
# for ff in items(c.cfiles[osA][cpuA]): # for ff in items(c.cfiles[osA][cpuA]):
# let f = ff.toUnix # 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")} $CC $COMP_FLAGS -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")}
# add(linkCmd, " \\\n" & changeFileExt(f, "o")) # add(linkCmd, " \\\n" & changeFileExt(f, "o"))
# end for # end for
echo "$LINKER -o ?{"$binDir/" & toLower(c.name)} ?linkCmd $LINK_FLAGS"
$LINKER -o ?{"$binDir/" & toLower(c.name)} ?linkCmd $LINK_FLAGS $LINKER -o ?{"$binDir/" & toLower(c.name)} ?linkCmd $LINK_FLAGS
;; ;;
# end for # end for
*) *)
echo "Error: no C code generated for: [$myos: $mycpu]" echo 2>&1 "Error: no C code generated for: [$myos: $mycpu]"
exit 1 exit 1
;; ;;
esac esac
;; ;;
# end for # end for
*) *)
echo "Error: no C code generated for: [$myos: $mycpu]" echo 2>&1 "Error: no C code generated for: [$myos: $mycpu]"
exit 1 exit 1
;; ;;
esac esac
echo "SUCCESS" : SUCCESS