Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/compile_kind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ impl CompileKind {
let kinds = match (fallback, &gctx.build_config()?.target) {
(_, None) | (CompileKindFallback::JustHost, _) => Ok(vec![CompileKind::Host]),
(CompileKindFallback::BuildConfig, Some(build_target_config)) => {
dedup(&build_target_config.values(gctx)?)
dedup(&build_target_config.values(gctx.cwd())?)
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/cargo/ops/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ pub fn add_overrides<'a>(
// The path listed next to the string is the config file in which the
// key was located, so we want to pop off the `.cargo/config` component
// to get the directory containing the `.cargo` folder.
(paths::normalize_path(&def.root(gctx).join(s)), def)
(paths::normalize_path(&def.root(gctx.cwd()).join(s)), def)
});

for (path, definition) in paths {
Expand Down
Loading