mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use utils::helpers::exe

Browse Source
This commit is contained in:
Pietro Albini 2024-07-10 09:27:30 +02:00
parent b4b2643c11
commit 9cd1d253a6
No known key found for this signature in database
GPG Key ID: CD76B35F7734769E
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bootstrap/src/core/config/config.rs
View File

@ -1451,11 +1451,6 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
config.out = crate::utils::helpers::absolute(&config.out); config.out = crate::utils::helpers::absolute(&config.out);
} }
// Hacky way to determine the executable suffix for the build target. We cannot use
// std::env::consts::EXE_SUFFIX as the build target might not be the target bootstrap was
// compiled with.
let initial_exe_suffix = if config.build.triple.contains("windows") { ".exe" } else { "" };
config.initial_rustc = if let Some(rustc) = rustc { config.initial_rustc = if let Some(rustc) = rustc {
if !flags.skip_stage0_validation { if !flags.skip_stage0_validation {
config.check_stage0_version(&rustc, "rustc"); config.check_stage0_version(&rustc, "rustc");
@ -1468,7 +1463,7 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
.join(config.build.triple) .join(config.build.triple)
.join("stage0") .join("stage0")
.join("bin") .join("bin")
.join(format!("rustc{initial_exe_suffix}")) .join(exe("rustc", config.build))
}; };
config.initial_cargo = if let Some(cargo) = cargo { config.initial_cargo = if let Some(cargo) = cargo {
@ -1483,7 +1478,7 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
.join(config.build.triple) .join(config.build.triple)
.join("stage0") .join("stage0")
.join("bin") .join("bin")
.join(format!("cargo{initial_exe_suffix}")) .join(exe("cargo", config.build))
}; };
// NOTE: it's important this comes *after* we set `initial_rustc` just above. // NOTE: it's important this comes *after* we set `initial_rustc` just above.