JehanneOS/devtools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

travis-ci: fix dotters

Browse Source
This commit is contained in:
Giacomo Tesio 2017-05-18 19:11:33 +02:00
parent 5e6f606295
commit 86d0b03316
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cross/init.sh
View File

@ -32,7 +32,7 @@ usyscalls header $JEHANNE/sys/src/sysconf.json > $JEHANNE/arch/amd64/include/sys
# create a GCC crosscompiler in Debian without requiring root access or Tex. # create a GCC crosscompiler in Debian without requiring root access or Tex.
# And this despite the extreme quality of Debian GNU/Linux! # And this despite the extreme quality of Debian GNU/Linux!
echo -n Building cross toolchain. echo -n please wait.
( (
# Inside parentheses, and therefore a subshell . . . # Inside parentheses, and therefore a subshell . . .
while [ 1 ] # Endless loop. while [ 1 ] # Endless loop.
@ -54,6 +54,9 @@ function failOnError {
# $1 -> exit status on a previous command # $1 -> exit status on a previous command
# $2 -> task description # $2 -> task description
if [ $1 -ne 0 ]; then if [ $1 -ne 0 ]; then
kill $dotter
wait $dotter 2>/dev/null
echo "ERROR $2" echo "ERROR $2"
echo echo
echo BUILD LOG: echo BUILD LOG:
@ -211,4 +214,3 @@ ln -sf /bin/bash $JEHANNE/hacking/cross/toolchain/bin/x86_64-jehanne-sh
kill $dotter kill $dotter
wait $dotter 2>/dev/null wait $dotter 2>/dev/null

3
cross/pkgs/newlib.sh
View File

@ -45,9 +45,10 @@ dotter=$!
function failOnError { function failOnError {
# $1 -> exit status on a previous command # $1 -> exit status on a previous command
# $2 -> task description # $2 -> task description
if [ $1 -ne 0 ]; then
kill $dotter kill $dotter
wait $dotter 2>/dev/null wait $dotter 2>/dev/null
if [ $1 -ne 0 ]; then
echo "ERROR $2" echo "ERROR $2"
if [ "$TRAVIS_BUILD_DIR" != "" ]; then if [ "$TRAVIS_BUILD_DIR" != "" ]; then
echo echo