Skip to content

Commit

Permalink
Fix compiler detection in buildbot
Browse files Browse the repository at this point in the history
it was just half-broken before...
sfan5 committed Nov 10, 2021
1 parent cbf658f commit c510037
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions util/buildbot/buildwin32.sh
Original file line number Diff line number Diff line change
@@ -25,10 +25,10 @@ command -v i686-w64-mingw32-gcc-posix >/dev/null &&
compiler=i686-w64-mingw32-gcc-posix

if [ -z "$compiler" ]; then
echo "Unable to determine which mingw32 compiler to use"
echo "Unable to determine which MinGW compiler to use"
exit 1
fi
toolchain_file=$dir/toolchain_${compiler%-gcc}.cmake
toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake
echo "Using $toolchain_file"

tmp=$(dirname "$(command -v $compiler)")/../i686-w64-mingw32/bin
8 changes: 4 additions & 4 deletions util/buildbot/buildwin64.sh
Original file line number Diff line number Diff line change
@@ -20,15 +20,15 @@ libdir=$builddir/libs

# Test which win64 compiler is present
command -v x86_64-w64-mingw32-gcc >/dev/null &&
compiler=x86_64-w64-mingw32
compiler=x86_64-w64-mingw32-gcc
command -v x86_64-w64-mingw32-gcc-posix >/dev/null &&
compiler=x86_64-w64-mingw32-posix
compiler=x86_64-w64-mingw32-gcc-posix

if [ -z "$compiler" ]; then
echo "Unable to determine which mingw32 compiler to use"
echo "Unable to determine which MinGW compiler to use"
exit 1
fi
toolchain_file=$dir/toolchain_${compiler%-gcc}.cmake
toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake
echo "Using $toolchain_file"

tmp=$(dirname "$(command -v $compiler)")/../x86_64-w64-mingw32/bin

0 comments on commit c510037

Please sign in to comment.