diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-03-27 14:52:34 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2017-04-06 22:47:15 +0100 |
| commit | 600f16f9f834f14ff411b477674b6112cbac33d1 (patch) | |
| tree | d40cff8cb637fb4a74d3149ed14499123ef7fbc8 /mesonbuild/backend/backends.py | |
| parent | cbc5064a67b2e7ff1a69d40f65c84e3d55fe2a66 (diff) | |
| download | meson-600f16f9f834f14ff411b477674b6112cbac33d1.zip meson-600f16f9f834f14ff411b477674b6112cbac33d1.tar.gz meson-600f16f9f834f14ff411b477674b6112cbac33d1.tar.bz2 | |
Use extra_paths on Cygwin
Cygwin executables are still loaded by the Windows PE loader, so PATH needs
to include any extra directories where required DLLs can be found.
Cygwin uses a unix style ':'-separated PATH. os.pathsep is used correctly
on extra_paths in meson_exe.py, but not in mesontest.py
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 |
1 files changed, 2 insertions, 2 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 = [] |