diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-12-28 16:40:22 +0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-12-28 18:52:52 +0300 |
| commit | 851c82df851928ec36241b1020943b8c548537a8 (patch) | |
| tree | 7d82fc9cdcb7c161f556fa0bf89047fff041fc0e /cargo_wrapper.py | |
| parent | 72fa5fa922c6c6df49e80919157a141173f8d0a3 (diff) | |
cargo_wrapper: Fix setting of PKG_CONFIG_PATH and CARGO_TARGET_DIR
Don't need to use an env var for the latter.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1028>
Diffstat (limited to 'cargo_wrapper.py')
| -rw-r--r-- | cargo_wrapper.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cargo_wrapper.py b/cargo_wrapper.py index 15244712e..60885e16d 100644 --- a/cargo_wrapper.py +++ b/cargo_wrapper.py @@ -72,9 +72,10 @@ if __name__ == "__main__": cargo_target_dir = opts.build_dir / 'target' env = os.environ.copy() - env['CARGO_TARGET_DIR'] = str(cargo_target_dir) - - pkg_config_path = env.get('PKG_CONFIG_PATH', '').split(os.pathsep) + if 'PKG_CONFIG_PATH' in env: + pkg_config_path = env['PKG_CONFIG_PATH'].split(os.pathsep) + else: + pkg_config_path = [] pkg_config_path.append(str(opts.root_dir / 'meson-uninstalled')) env['PKG_CONFIG_PATH'] = os.pathsep.join(pkg_config_path) @@ -96,6 +97,7 @@ if __name__ == "__main__": sys.exit(1) cwd = None + cargo_cmd += ['--target-dir', cargo_target_dir] if not opts.bin: cargo_cmd.extend(['--manifest-path', opts.src_dir / 'Cargo.toml']) cargo_cmd.extend(['--prefix', opts.prefix, '--libdir', |