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/ninjabackend.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/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |