diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2022-01-09 22:57:13 +0100 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2022-01-09 23:04:13 +0100 |
| commit | 572ef7a2acdd50f82426eedb8facdb7fe0beab12 (patch) | |
| tree | c0e2c0108781bab9471d207811369ff78ac932e0 | |
| parent | 9dc50735f737eaf6890ad3fd4903db62b03a9ac4 (diff) | |
| download | libexpat-git-fix-run-sh-in-for-native-windows.tar.gz | |
run.sh.in: Do not use Wine with Cygwin and MSYS2fix-run-sh-in-for-native-windows
| -rw-r--r-- | expat/Changes | 4 | ||||
| -rw-r--r-- | expat/run.sh.in | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/expat/Changes b/expat/Changes index bd620a7d..4d4de0bb 100644 --- a/expat/Changes +++ b/expat/Changes @@ -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 diff --git a/expat/run.sh.in b/expat/run.sh.in index 9b7730dd..396ff0d7 100644 --- a/expat/run.sh.in +++ b/expat/run.sh.in @@ -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 "$@" |