Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 03:23:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler detection in buildbot

Browse Source 
it was just half-broken before...
This commit is contained in:
sfan5 2021-11-07 17:50:57 +01:00
parent cbf658f83d
commit c510037e9a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/buildbot/buildwin32.sh
View File

@ -25,10 +25,10 @@ command -v i686-w64-mingw32-gcc-posix >/dev/null &&
compiler=i686-w64-mingw32-gcc-posix compiler=i686-w64-mingw32-gcc-posix
if [ -z "$compiler" ]; then if [ -z "$compiler" ]; then
echo "Unable to determine which mingw32 compiler to use" echo "Unable to determine which MinGW compiler to use"
exit 1 exit 1
fi fi
toolchain_file=$dir/toolchain_${compiler%-gcc}.cmake toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake
echo "Using $toolchain_file" echo "Using $toolchain_file"
tmp=$(dirname "$(command -v $compiler)")/../i686-w64-mingw32/bin tmp=$(dirname "$(command -v $compiler)")/../i686-w64-mingw32/bin

8
util/buildbot/buildwin64.sh
View File

@ -20,15 +20,15 @@ libdir=$builddir/libs
# Test which win64 compiler is present # Test which win64 compiler is present
command -v x86_64-w64-mingw32-gcc >/dev/null && 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 && 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 if [ -z "$compiler" ]; then
echo "Unable to determine which mingw32 compiler to use" echo "Unable to determine which MinGW compiler to use"
exit 1 exit 1
fi fi
toolchain_file=$dir/toolchain_${compiler%-gcc}.cmake toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake
echo "Using $toolchain_file" echo "Using $toolchain_file"
tmp=$(dirname "$(command -v $compiler)")/../x86_64-w64-mingw32/bin tmp=$(dirname "$(command -v $compiler)")/../x86_64-w64-mingw32/bin