diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-04-08 21:08:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 21:08:33 +0300 |
| commit | aad21d26393326b61eefaef837aedb17e494f5ee (patch) | |
| tree | 673663f68cd77f790cea2e11f1e48bdca0115f5e /mesonbuild/backend | |
| parent | af820b77d88be0865169aa7f2f66a60f41675825 (diff) | |
| parent | 44c54affda4526a90e20d457786fa6fc2d3cbe06 (diff) | |
| download | meson-aad21d26393326b61eefaef837aedb17e494f5ee.zip meson-aad21d26393326b61eefaef837aedb17e494f5ee.tar.gz meson-aad21d26393326b61eefaef837aedb17e494f5ee.tar.bz2 | |
Merge pull request #1567 from jon-turney/cygwin
Add Cygwin support
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 5517fbd..80cf0ee 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -252,7 +252,7 @@ class Backend: exe_wrapper = self.environment.cross_info.config['binaries'].get('exe_wrapper', None) else: exe_wrapper = None - if mesonlib.is_windows(): + if mesonlib.is_windows() or mesonlib.is_cygwin(): extra_paths = self.determine_windows_extra_paths(exe) else: extra_paths = [] @@ -481,7 +481,7 @@ class Backend: exe_wrapper = self.environment.cross_info.config['binaries'].get('exe_wrapper', None) else: exe_wrapper = None - if mesonlib.is_windows(): + if mesonlib.is_windows() or mesonlib.is_cygwin(): extra_paths = self.determine_windows_extra_paths(exe) else: extra_paths = [] diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index bc51ace..3143970 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -492,7 +492,7 @@ int dummy; # the project, we need to set PATH so the DLLs are found. We use # a serialized executable wrapper for that and check if the # CustomTarget command needs extra paths first. - if target.capture or (mesonlib.is_windows() and + if target.capture or ((mesonlib.is_windows() or mesonlib.is_cygwin()) and self.determine_windows_extra_paths(target.command[0])): exe_data = self.serialise_executable(target.command[0], cmd[1:], # All targets are built from the build dir |