From fd47ef3a274e85f4391808f7bbade2a807ab53df Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 4 Apr 2017 11:39:09 +0100 Subject: Use '.exe' extension for executables for Cygwin Use '.exe' extension for executables for Cygwin when building and installing --- mesonbuild/scripts/meson_exe.py | 6 +++++- mesonbuild/scripts/meson_install.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'mesonbuild/scripts') diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py index 5c5c31776..643e1af7b 100644 --- a/mesonbuild/scripts/meson_exe.py +++ b/mesonbuild/scripts/meson_exe.py @@ -29,8 +29,12 @@ def is_windows(): platname = platform.system().lower() return platname == 'windows' or 'mingw' in platname +def is_cygwin(): + platname = platform.system().lower() + return 'cygwin' in platname + def run_with_mono(fname): - if fname.endswith('.exe') and not is_windows(): + if fname.endswith('.exe') and not (is_windows() or is_cygwin()): return True return False diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index 8fb9e0403..af84f6463 100644 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -193,7 +193,7 @@ def run_install_script(d): def is_elf_platform(): platname = platform.system().lower() - if platname == 'darwin' or platname == 'windows': + if platname == 'darwin' or platname == 'windows' or platname == 'cygwin': return False return True -- cgit v1.2.3