diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-09-12 13:31:03 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-10-29 11:34:19 -0700 |
| commit | cbb2aa9067a257a2def469a74f498d2a2bf4a8d9 (patch) | |
| tree | df2587b2d97acd337ffe9793fa35e2bb97f7117a /mesonbuild/cargo | |
| parent | 47892872a8a1bd84ddf565cbe2332d263f669494 (diff) | |
| download | meson-cbb2aa9067a257a2def469a74f498d2a2bf4a8d9.tar.gz | |
cargo: put all dependencies in the rust_dependency_map
While this has no effect, it makes it easier to move the
generation of the rust_dependency_map out of the interpreter.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild/cargo')
| -rw-r--r-- | mesonbuild/cargo/interpreter.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/cargo/interpreter.py b/mesonbuild/cargo/interpreter.py index 92874d383..6ec6e8c6a 100644 --- a/mesonbuild/cargo/interpreter.py +++ b/mesonbuild/cargo/interpreter.py @@ -698,10 +698,10 @@ class Interpreter: for name in cfg.required_deps: dep = pkg.manifest.dependencies[name] dependencies.append(build.identifier(_dependency_varname(dep))) - if name != dep.package: - dep_pkg = self._dep_package(pkg, dep) - dep_lib_name = _library_name(dep_pkg.manifest.lib.name, dep_pkg.manifest.package.api) - dependency_map[build.string(dep_lib_name)] = build.string(name) + dep_pkg = self._dep_package(pkg, dep) + dep_lib_name = _library_name(dep_pkg.manifest.lib.name, dep_pkg.manifest.package.api) + dep_crate_name = name if name != dep.package else dep_pkg.manifest.lib.name + dependency_map[build.string(dep_lib_name)] = build.string(dep_crate_name) for name, sys_dep in pkg.manifest.system_dependencies.items(): if sys_dep.enabled(cfg.features): dependencies.append(build.identifier(f'{fixup_meson_varname(name)}_system_dep')) |