From c510037e9a334b3327a6d6b066203618051e4a09 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 7 Nov 2021 17:50:57 +0100 Subject: Fix compiler detection in buildbot it was just half-broken before... --- util/buildbot/buildwin64.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'util/buildbot/buildwin64.sh') 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 -- cgit v1.2.3