diff --git a/src/bootstrap/src/core/build_steps/gcc.rs b/src/bootstrap/src/core/build_steps/gcc.rs index e525078a4da00..76112b1986475 100644 --- a/src/bootstrap/src/core/build_steps/gcc.rs +++ b/src/bootstrap/src/core/build_steps/gcc.rs @@ -64,7 +64,7 @@ impl Step for Gcc { return GccOutput { libgccjit: libgccjit_path }; } - build_gcc(&metadata, &builder, target); + build_gcc(&metadata, builder, target); let lib_alias = metadata.install_dir.join("lib/libgccjit.so.0"); if !lib_alias.exists() { @@ -169,7 +169,7 @@ fn libgccjit_built_path(install_dir: &Path) -> PathBuf { fn build_gcc(metadata: &Meta, builder: &Builder<'_>, target: TargetSelection) { let Meta { stamp: _, out_dir, install_dir, root } = metadata; - t!(fs::create_dir_all(&out_dir)); + t!(fs::create_dir_all(out_dir)); // GCC creates files (e.g. symlinks to the downloaded dependencies) // in the source directory, which does not work with our CI setup, where we mount @@ -182,7 +182,7 @@ fn build_gcc(metadata: &Meta, builder: &Builder<'_>, target: TargetSelection) { builder.remove_dir(&src_dir); } builder.create_dir(&src_dir); - builder.cp_link_r(&root, &src_dir); + builder.cp_link_r(root, &src_dir); src_dir } else { root.clone() @@ -191,7 +191,7 @@ fn build_gcc(metadata: &Meta, builder: &Builder<'_>, target: TargetSelection) { command(src_dir.join("contrib/download_prerequisites")).current_dir(&src_dir).run(builder); let mut configure_cmd = command(src_dir.join("configure")); configure_cmd - .current_dir(&out_dir) + .current_dir(out_dir) // On CI, we compile GCC with Clang. // The -Wno-everything flag is needed to make GCC compile with Clang 19. // `-g -O2` are the default flags that are otherwise used by Make. @@ -225,8 +225,8 @@ fn build_gcc(metadata: &Meta, builder: &Builder<'_>, target: TargetSelection) { } configure_cmd.run(builder); - command("make").current_dir(&out_dir).arg(format!("-j{}", builder.jobs())).run(builder); - command("make").current_dir(&out_dir).arg("install").run(builder); + command("make").current_dir(out_dir).arg(format!("-j{}", builder.jobs())).run(builder); + command("make").current_dir(out_dir).arg("install").run(builder); } /// Configures a Cargo invocation so that it can build the GCC codegen backend. diff --git a/src/bootstrap/src/core/download.rs b/src/bootstrap/src/core/download.rs index 15ec5f8279795..95feb41ffd0cc 100644 --- a/src/bootstrap/src/core/download.rs +++ b/src/bootstrap/src/core/download.rs @@ -852,7 +852,7 @@ download-rustc = false "; self.download_file(&format!("{base}/{gcc_sha}/{filename}"), &tarball, help_on_error); } - self.unpack(&tarball, &root_dir, "gcc"); + self.unpack(&tarball, root_dir, "gcc"); } }