Fix compiler detection in buildbot

it was just half-broken before...
minetest · Nov 10, 2021 · c510037 · c510037
1 parent cbf658f
commit c510037
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
@@ -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

diff --git 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