diff options
| author | Diego Ismirlian <dismirlian@gmail.com> | 2019-08-24 17:45:41 -0300 |
|---|---|---|
| committer | Diego Ismirlian <dismirlian@gmail.com> | 2019-08-24 17:45:41 -0300 |
| commit | 7b2c61a676e024163057ec5ccc508a29ab3b9ed4 (patch) | |
| tree | 5d1f5423a4e720d657681794ac81dc2a2004cbb0 /tools/chbuild.sh | |
| parent | 81391097156ce2c9fc71c3350457522841e10095 (diff) | |
| parent | e346e779339636f578536785014609e46866fb9c (diff) | |
| download | ChibiOS-Contrib-7b2c61a676e024163057ec5ccc508a29ab3b9ed4.tar.gz ChibiOS-Contrib-7b2c61a676e024163057ec5ccc508a29ab3b9ed4.tar.bz2 ChibiOS-Contrib-7b2c61a676e024163057ec5ccc508a29ab3b9ed4.zip | |
Merge branch 'master' of https://github.com/ChibiOS/ChibiOS-Contrib
Diffstat (limited to 'tools/chbuild.sh')
| -rwxr-xr-x | tools/chbuild.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/chbuild.sh b/tools/chbuild.sh index 6323dcb..0340114 100755 --- a/tools/chbuild.sh +++ b/tools/chbuild.sh @@ -11,7 +11,6 @@ JOBS=$(grep -c ^processor /proc/cpuinfo) SKIP_ARRAY=(Win32) RETCODE=0 - function test_skip { Array=$1 SKIP=0 @@ -42,7 +41,11 @@ function chbuild { fi pushd $t > /dev/null printf "BUILDING: ${t}\n" - make --quiet -j $JOBS > /dev/null + if [[ -z "$CH_PATH" && -z "$CHC_PATH" ]]; then + make --quiet -j $JOBS > /dev/null + else + make CHIBIOS=$CH_PATH CHIBIOS_CONTRIB=$CHC_PATH --quiet -j $JOBS > /dev/null + fi if [ $? -ne 0 ]; then ((NOK++)) FAIL+=($t) |