Skip to content

Commit

Permalink
build libcxx-version only when it doesn't exist
Browse files Browse the repository at this point in the history
Signed-off-by: onur-ozkan <work@onurozkan.dev>
  • Loading branch information
onur-ozkan committed Jun 14, 2024
1 parent d2ad293 commit ad787c1
Showing 1 changed file with 19 additions and 9 deletions.
28 changes: 19 additions & 9 deletions src/bootstrap/src/core/build_steps/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -823,19 +823,29 @@ impl Step for LibcxxVersionTool {

fn run(self, builder: &Builder<'_>) -> LibcxxVersion {
let out_dir = builder.out.join(self.target.to_string()).join("libcxx-version");
let _ = fs::remove_dir_all(&out_dir);
t!(fs::create_dir_all(&out_dir));
let executable = out_dir.join(exe("libcxx-version", self.target));

let compiler = builder.cxx(self.target).unwrap();
let mut cmd = Command::new(compiler);
// This is a sanity-check specific step, which means it is frequently called (when using
// CI LLVM), and compiling `src/tools/libcxx-version/main.cpp` at the beginning of the bootstrap
// invocation adds a fair amount of overhead to the process (see https://github.com/rust-lang/rust/issues/126423).
// Therefore, we want to avoid recompiling this file unnecessarily.
if !executable.exists() {
if !out_dir.exists() {
t!(fs::create_dir_all(&out_dir));
}

let executable = out_dir.join(exe("libcxx-version", self.target));
cmd.arg("-o").arg(&executable).arg(builder.src.join("src/tools/libcxx-version/main.cpp"));
let compiler = builder.cxx(self.target).unwrap();
let mut cmd = Command::new(compiler);

builder.run_cmd(&mut cmd);
cmd.arg("-o")
.arg(&executable)
.arg(builder.src.join("src/tools/libcxx-version/main.cpp"));

if !executable.exists() {
panic!("Something went wrong. {} is not present", executable.display());
builder.run_cmd(&mut cmd);

if !executable.exists() {
panic!("Something went wrong. {} is not present", executable.display());
}
}

let version_output = output(&mut Command::new(executable));
Expand Down

0 comments on commit ad787c1

Please sign in to comment.