diff options
| author | sfan5 <sfan5@live.de> | 2021-11-07 17:50:57 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2021-11-10 19:10:32 +0100 |
| commit | c510037e9a334b3327a6d6b066203618051e4a09 (patch) | |
| tree | b8fda1847d2dd54020b5e975adcd9559c524688e | |
| parent | cbf658f83d206bf340ab4aa8eab02b058e9b293f (diff) | |
| download | minetest-c510037e9a334b3327a6d6b066203618051e4a09.tar.gz minetest-c510037e9a334b3327a6d6b066203618051e4a09.tar.bz2 minetest-c510037e9a334b3327a6d6b066203618051e4a09.zip | |
Fix compiler detection in buildbot
it was just half-broken before...
| -rwxr-xr-x | util/buildbot/buildwin32.sh | 4 | ||||
| -rwxr-xr-x | util/buildbot/buildwin64.sh | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index bbeab3a3f..cdf6105d1 100755 --- 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 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 |