about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJubilee <46493976+workingjubilee@users.noreply.github.com>2024-06-06 14:46:25 -0700
committerGitHub <noreply@github.com>2024-06-06 14:46:25 -0700
commit7e81738d5cff93329dd5cbd530380b88f8d54d2c (patch)
tree2ba657392b3b6a5f097c01a57ea36f1776b5de97
parentaf229f5e0062b8f0dce81c7fd0150256e9358a87 (diff)
parent9c46479a6ad881472c64a22ae033dca320e7213e (diff)
downloadrust-7e81738d5cff93329dd5cbd530380b88f8d54d2c.tar.gz
rust-7e81738d5cff93329dd5cbd530380b88f8d54d2c.zip
Rollup merge of #126086 - onur-ozkan:use-exe, r=petrochenkov
use windows compatible executable name for libcxx-version

Resolves #https://github.com/rust-lang/rust/pull/125411#discussion_r1629915724
-rw-r--r--src/bootstrap/src/core/build_steps/tool.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
index 05b19c0a6e3..1b55fc85da4 100644
--- a/src/bootstrap/src/core/build_steps/tool.rs
+++ b/src/bootstrap/src/core/build_steps/tool.rs
@@ -834,7 +834,7 @@ impl Step for LibcxxVersionTool {
         let compiler = builder.cxx(self.target).unwrap();
         let mut cmd = Command::new(compiler);
 
-        let executable = out_dir.join("libcxx-version");
+        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"));
 
         builder.run_cmd(&mut cmd);