diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-06-08 15:03:47 +0300 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-07-12 11:14:17 +0300 |
| commit | 89002b45626c251bc2b8d8bad5b2e37016991868 (patch) | |
| tree | 78d7829765bde3688d68eb26cde7de229e4b9a2b /meson.build | |
| parent | bbd3d9ffe04081f0ac8d44374dd123fe301dd310 (diff) | |
meson: Don't override RUSTFLAGS in the env
Meson does not add RUSTFLAGS to rustc.cmd_array(), so the effect of
this code is to override that value in the env.
This is hacky, since the env has to match during setup and compile
now, and rust_args added in the cross / native file will be ignored.
But at least it fixes this regression:
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/372
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1237>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/meson.build b/meson.build index 3d5a72093..05b9a3d8a 100644 --- a/meson.build +++ b/meson.build @@ -386,17 +386,8 @@ if pkg_config_path.length() > 0 extra_env += {'PKG_CONFIG_PATH': pathsep.join(pkg_config_path)} endif -# get compiler and flags for rust (if any) -rustc_cmd = '' -rust_flags = [] -foreach rustc_arg : rustc.cmd_array() - if rustc_cmd == '' - rustc_cmd = rustc_arg - else - rust_flags += [rustc_arg] - endif -endforeach -extra_env += {'RUSTC': rustc_cmd, 'RUSTFLAGS': ' '.join(rust_flags)} +# get cmdline for rust +extra_env += {'RUSTC': ' '.join(rustc.cmd_array())} rs_plugins = custom_target('gst-plugins-rs', build_by_default: true, |