nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-04 19:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix library target overriding sysroot deps

Browse Source
This commit is contained in:
Jonas Schievink 2021-12-08 17:05:00 +01:00
parent 86ba54c060
commit 58ce331baa
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/project_model/src/workspace.rs
View File

@ -595,6 +595,9 @@ fn cargo_to_crate_graph(
// Set deps to the core, std and to the lib target of the current package // Set deps to the core, std and to the lib target of the current package
for (from, kind) in pkg_crates.get(&pkg).into_iter().flatten() { for (from, kind) in pkg_crates.get(&pkg).into_iter().flatten() {
// Add sysroot deps first so that a lib target named `core` etc. can overwrite them.
public_deps.add(*from, &mut crate_graph);
if let Some((to, name)) = lib_tgt.clone() { if let Some((to, name)) = lib_tgt.clone() {
if to != *from && *kind != TargetKind::BuildScript { if to != *from && *kind != TargetKind::BuildScript {
// (build script can not depend on its library target) // (build script can not depend on its library target)
@ -606,7 +609,6 @@ fn cargo_to_crate_graph(
add_dep(&mut crate_graph, *from, name, to); add_dep(&mut crate_graph, *from, name, to);
} }
} }
public_deps.add(*from, &mut crate_graph);
} }
} }