summaryrefslogtreecommitdiff
path: root/util/buildbot/buildwin32.sh
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2021-03-05 17:40:27 +0100
committersfan5 <sfan5@live.de>2021-03-06 23:01:50 +0100
commitdd228fd92ef3a06aa8c6ce89bb304110a9587c38 (patch)
treefa2f5b3798aa74e61413b592ccafae169963e47a /util/buildbot/buildwin32.sh
parent1c7b69f9cf40a1395e851b1874ecad31e0e4147a (diff)
downloadminetest-dd228fd92ef3a06aa8c6ce89bb304110a9587c38.tar.gz
minetest-dd228fd92ef3a06aa8c6ce89bb304110a9587c38.tar.bz2
minetest-dd228fd92ef3a06aa8c6ce89bb304110a9587c38.zip
buildbot: Drop i586-mingw32msvc, add i686-w64-mingw32-posix detection
Diffstat (limited to 'util/buildbot/buildwin32.sh')
-rwxr-xr-xutil/buildbot/buildwin32.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index e62d32969..a296d9999 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -20,8 +20,10 @@ packagedir=$builddir/packages
libdir=$builddir/libs
# Test which win32 compiler is present
-which i586-mingw32msvc-windres &>/dev/null && toolchain_file=$dir/toolchain_i586-mingw32msvc.cmake
-which i686-w64-mingw32-windres &>/dev/null && toolchain_file=$dir/toolchain_i646-w64-mingw32.cmake
+which i686-w64-mingw32-gcc &>/dev/null &&
+ toolchain_file=$dir/toolchain_i686-w64-mingw32.cmake
+which i686-w64-mingw32-gcc-posix &>/dev/null &&
+ toolchain_file=$dir/toolchain_i686-w64-mingw32-posix.cmake
if [ -z "$toolchain_file" ]; then
echo "Unable to determine which mingw32 compiler to use"