From e158f4ef88b2f418d2a5ba0b4ec5e1d78fdf3ce4 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 2 Jan 2020 21:37:47 +0530 Subject: [PATCH] meson: rename cargo.py to cargo_wrapper.py Fix 'cargo build' on Windows as its $PATH includes $PWD, it seems to pick our script rather than the actual cargo. --- cargo.py => cargo_wrapper.py | 0 meson.build | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename cargo.py => cargo_wrapper.py (100%) diff --git a/cargo.py b/cargo_wrapper.py similarity index 100% rename from cargo.py rename to cargo_wrapper.py diff --git a/meson.build b/meson.build index c783d60c..119f4ca6 100644 --- a/meson.build +++ b/meson.build @@ -10,7 +10,7 @@ else endif cargo = find_program('cargo', version:'>=1.39') -cargo_script = find_program('cargo.py') +cargo_wrapper = find_program('cargo_wrapper.py') system = build_machine.system() if system == 'windows' @@ -88,7 +88,7 @@ rs_plugins = custom_target('gst-plugins-rs', install: false, build_always_stale: true, depends: depends, - command: [cargo_script, + command: [cargo_wrapper, meson.current_build_dir(), meson.current_source_dir(), meson.build_root(),