mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
Fix compiler detection in buildbot
it was just half-broken before...
This commit is contained in:
parent
cbf658f83d
commit
c510037e9a
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user