Skip to content

Commit

Permalink
fix various errors
Browse files Browse the repository at this point in the history
Signed-off-by: onur-ozkan <[email protected]>
  • Loading branch information
onur-ozkan committed Mar 17, 2024
1 parent 0966074 commit f884dec
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/bootstrap/src/core/build_steps/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ impl Step for Std {

builder.update_submodule(&Path::new("library").join("stdarch"));

let mut cargo = builder.cargo(
let mut cargo = builder::Cargo::new(
builder,
compiler,
Mode::Std,
SourceType::InTree,
Expand Down
4 changes: 2 additions & 2 deletions src/bootstrap/src/core/build_steps/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ impl Step for StdLink {

// Copy all *.so files from stage0/lib to stage0-sysroot/lib
let stage0_lib_dir = builder.out.join(&host).join("stage0/lib");
builder.cp_r(&stage0_lib_dir, &sysroot.join("lib"));
builder.cp_link_r(&stage0_lib_dir, &sysroot.join("lib"));

// Copy codegen-backends from stage0
let sysroot_codegen_backends = builder.sysroot_codegen_backends(compiler);
Expand All @@ -674,7 +674,7 @@ impl Step for StdLink {
}
} else if compiler.stage == 0 {
let sysroot = builder.out.join(&compiler.host.triple).join("stage0-sysroot");
builder.cp_r(&builder.initial_sysroot.join("lib"), &sysroot.join("lib"));
builder.cp_link_r(&builder.initial_sysroot.join("lib"), &sysroot.join("lib"));
} else {
add_to_sysroot(builder, &libdir, &hostdir, &libstd_stamp(builder, compiler, target));
}
Expand Down

0 comments on commit f884dec

Please sign in to comment.