aboutsummaryrefslogtreecommitdiff
path: root/util/buildbot/buildwin64.sh
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2021-11-07 17:50:57 +0100
committersfan5 <sfan5@live.de>2021-11-10 19:10:32 +0100
commitc510037e9a334b3327a6d6b066203618051e4a09 (patch)
treeb8fda1847d2dd54020b5e975adcd9559c524688e /util/buildbot/buildwin64.sh
parentcbf658f83d206bf340ab4aa8eab02b058e9b293f (diff)
downloadminetest-c510037e9a334b3327a6d6b066203618051e4a09.tar.gz
minetest-c510037e9a334b3327a6d6b066203618051e4a09.tar.bz2
minetest-c510037e9a334b3327a6d6b066203618051e4a09.zip
Fix compiler detection in buildbot
it was just half-broken before...
Diffstat (limited to 'util/buildbot/buildwin64.sh')
-rwxr-xr-xutil/buildbot/buildwin64.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index 2bc127896..f8ff3cfdd 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -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