osmith has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/32728 )
Change subject: contrib/jenkins: tweak shell logic ......................................................................
contrib/jenkins: tweak shell logic
Move the logic down to where make gets called, so we don't need the variable. Print whether we use CLANG or GCC.
Don't put /opt/llvm-arm/bin infront of PATH unless building with CLANG. Right now it doesn't seem to have e.g. an override for gcc, but the files in that path may change when we update LLVM-embedded-toolchain-for-Arm.
Related: OS#6026 Change-Id: Id768e0dbed9265f042b942e6699683723ca40a7c --- M contrib/jenkins.sh 1 file changed, 28 insertions(+), 4 deletions(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve dexter: Looks good to me, approved
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 1e2846c..e53a450 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -38,7 +38,6 @@ for build in $BUILDS; do board=`echo $build | cut -d "/" -f 1` app=`echo $build | cut -d "/" -f 2` - [ "$app" == "dfu" ] && use_clang_for_bl=1 || use_clang_for_bl=0 case "$build" in "owhw/cardem") comb="combined" @@ -57,9 +56,16 @@ ;; esac echo - echo "=============== $board / $app START ==============" - PATH="/opt/llvm-arm/bin:$PATH" make USE_CLANG="$use_clang_for_bl" BOARD="$board" APP="$app" $comb - echo "=============== $board / $app RES:$? ==============" + # Build the bootloader with clang, the rest with gcc (OS#5260, OS#6026) + if [ "$app" = "dfu" ]; then + echo "=============== $board / $app START (CLANG) ==============" + PATH="/opt/llvm-arm/bin:$PATH" make USE_CLANG=1 BOARD="$board" APP="$app" $comb + echo "=============== $board / $app RES:$? ==============" + else + echo "=============== $board / $app START (GCC) ==============" + make USE_CLANG=0 BOARD="$board" APP="$app" $comb + echo "=============== $board / $app RES:$? ==============" + fi done
echo