Fix compiler detection in buildbot

it was just half-broken before...

diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index bbeab3a3f0d3998176d0f1608a489a517fe87fbe..cdf6105d1a22a9168b06c87f7618964e37d4f958 100755 (executable)
--- 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
index 2bc127896390348c04bd8c475a874643a7a1b5fa..f8ff3cfdd91c12e99abb66e0c9be43976b57f681 100755 (executable)
--- 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