Merge pull request #541 from libexpat/fix-run-sh-in-for-native-windows

run.sh.in: Do not use Wine with Cygwin and MSYS2
This commit is contained in:
Sebastian Pipping 2022-01-10 16:26:31 +01:00 committed by GitHub
commit b6b432bad5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions

View File

@ -20,11 +20,15 @@ Release x.x.x xxx xxxxxxxx xx xxxx
Other changes:
#535 CMake: Make call to file(GENERATE [..]) work for CMake <3.19
#527 #528 Address compiler warnings
#541 Autotools|CMake: MinGW: Make run.sh(.in) work for Cygwin
and MSYS2 by not going through Wine on these platforms
Infrastructure:
#536 CI: Check for realistic minimum CMake version
Special thanks to:
Christopher Degawa
J. Peter Mugaas
Tyson Smith
and
GCC Farm Project

View File

@ -30,7 +30,16 @@
case "@host@" in
*-mingw*)
exec wine "$@"
case "$(uname -o)" in
Cygwin|Msys)
# Windows binary on Windows host
exec "$@"
;;
*)
# Windows binary on non-Windows host
exec wine "$@"
;;
esac
;;
*)
exec "$@"