user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename is_host_target to is_builder_target

Browse source 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
onur-ozkan 2025-02-10 11:25:35 +03:00
parent 61ba728b18
commit acc7ddfd53
7 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/bootstrap/src/core/build_steps/compile.rs
View file

@ -191,7 +191,7 @@ impl Step for Std {
// The LLD wrappers and `rust-lld` are self-contained linking components that can be
// necessary to link the stdlib on some targets. We'll also need to copy these binaries to
// the `stage0-sysroot` to ensure the linker is found when bootstrapping on such a target.
if compiler.stage == 0 && builder.is_host_target(&compiler.host) {
if compiler.stage == 0 && builder.is_builder_target(&compiler.host) {
// We want to copy the host `bin` folder within the `rustlib` folder in the sysroot.
let src_sysroot_bin = builder
.rustc_snapshot_sysroot()
@ -2312,7 +2312,8 @@ pub fn strip_debug(builder: &Builder<'_>, target: TargetSelection, path: &Path)
// FIXME: to make things simpler for now, limit this to the host and target where we know
// `strip -g` is both available and will fix the issue, i.e. on a x64 linux host that is not
// cross-compiling. Expand this to other appropriate targets in the future.
if target != "x86_64-unknown-linux-gnu" || !builder.is_host_target(&target) || !path.exists() {
if target != "x86_64-unknown-linux-gnu" || !builder.is_builder_target(&target) || !path.exists()
{
return;
}

6
src/bootstrap/src/core/build_steps/dist.rs
View file

@ -582,7 +582,7 @@ impl Step for DebuggerScripts {
fn skip_host_target_lib(builder: &Builder<'_>, compiler: Compiler) -> bool {
// The only true set of target libraries came from the build triple, so
// let's reduce redundant work by only producing archives from that host.
if !builder.is_host_target(&compiler.host) {
if !builder.is_builder_target(&compiler.host) {
builder.info("\tskipping, not a build host");
true
} else {
@ -637,7 +637,7 @@ fn copy_target_libs(
for (path, dependency_type) in builder.read_stamp_file(stamp) {
if dependency_type == DependencyType::TargetSelfContained {
builder.copy_link(&path, &self_contained_dst.join(path.file_name().unwrap()));
} else if dependency_type == DependencyType::Target || builder.is_host_target(&target) {
} else if dependency_type == DependencyType::Target || builder.is_builder_target(&target) {
builder.copy_link(&path, &dst.join(path.file_name().unwrap()));
}
}
@ -786,7 +786,7 @@ impl Step for Analysis {
fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let compiler = self.compiler;
let target = self.target;
if !builder.is_host_target(&compiler.host) {
if !builder.is_builder_target(&compiler.host) {
return None;
}

6
src/bootstrap/src/core/build_steps/llvm.rs
View file

@ -516,7 +516,7 @@ impl Step for Llvm {
}
// https://llvm.org/docs/HowToCrossCompileLLVM.html
if !builder.is_host_target(&target) {
if !builder.is_builder_target(&target) {
let LlvmResult { llvm_config, .. } =
builder.ensure(Llvm { target: builder.config.build });
if !builder.config.dry_run() {
@ -661,7 +661,7 @@ fn configure_cmake(
}
cfg.target(&target.triple).host(&builder.config.build.triple);
if !builder.is_host_target(&target) {
if !builder.is_builder_target(&target) {
cfg.define("CMAKE_CROSSCOMPILING", "True");
if target.contains("netbsd") {
@ -1111,7 +1111,7 @@ impl Step for Lld {
.define("LLVM_CMAKE_DIR", llvm_cmake_dir)
.define("LLVM_INCLUDE_TESTS", "OFF");
if !builder.is_host_target(&target) {
if !builder.is_builder_target(&target) {
// Use the host llvm-tblgen binary.
cfg.define(
"LLVM_TABLEGEN_EXE",

2
src/bootstrap/src/core/build_steps/test.rs
View file

@ -2742,7 +2742,7 @@ impl Step for Crate {
cargo
} else {
// Also prepare a sysroot for the target.
if !builder.is_host_target(&target) {
if !builder.is_builder_target(&target) {
builder.ensure(compile::Std::new(compiler, target).force_recompile(true));
builder.ensure(RemoteCopyLibs { compiler, target });
}

7
src/bootstrap/src/core/builder/tests.rs
View file

@ -1066,7 +1066,8 @@ fn test_prebuilt_llvm_config_path_resolution() {
assert_eq!(expected, actual);
}
fn test_is_host_target() {
#[test]
fn test_is_builder_target() {
let target1 = TargetSelection::from_user(TEST_TRIPLE_1);
let target2 = TargetSelection::from_user(TEST_TRIPLE_2);
@ -1076,7 +1077,7 @@ fn test_is_host_target() {
let build = Build::new(config);
let builder = Builder::new(&build);
assert!(builder.is_host_target(&target1));
assert!(!builder.is_host_target(&target2));
assert!(builder.is_builder_target(&target1));
assert!(!builder.is_builder_target(&target2));
}
}

2
src/bootstrap/src/core/sanity.rs
View file

@ -329,7 +329,7 @@ than building it.
if target.contains("musl") && !target.contains("unikraft") {
// If this is a native target (host is also musl) and no musl-root is given,
// fall back to the system toolchain in /usr before giving up
if build.musl_root(*target).is_none() && build.is_host_target(target) {
if build.musl_root(*target).is_none() && build.is_builder_target(target) {
let target = build.config.target_config.entry(*target).or_default();
target.musl_root = Some("/usr".into());
}

10
src/bootstrap/src/lib.rs
View file

@ -739,7 +739,7 @@ impl Build {
/// Note that if LLVM is configured externally then the directory returned
/// will likely be empty.
fn llvm_out(&self, target: TargetSelection) -> PathBuf {
if self.config.llvm_from_ci && self.is_host_target(&target) {
if self.config.llvm_from_ci && self.is_builder_target(&target) {
self.config.ci_llvm_root()
} else {
self.out.join(target).join("llvm")
@ -789,7 +789,7 @@ impl Build {
fn is_system_llvm(&self, target: TargetSelection) -> bool {
match self.config.target_config.get(&target) {
Some(Target { llvm_config: Some(_), .. }) => {
let ci_llvm = self.config.llvm_from_ci && self.is_host_target(&target);
let ci_llvm = self.config.llvm_from_ci && self.is_builder_target(&target);
!ci_llvm
}
// We're building from the in-tree src/llvm-project sources.
@ -1274,7 +1274,7 @@ Executed at: {executed_at}"#,
// need to use CXX compiler as linker to resolve the exception functions
// that are only existed in CXX libraries
Some(self.cxx.borrow()[&target].path().into())
} else if !self.is_host_target(&target)
} else if !self.is_builder_target(&target)
&& helpers::use_host_linker(target)
&& !target.is_msvc()
{
@ -1926,8 +1926,8 @@ to download LLVM rather than building it.
result
}
/// Checks if the given target is the same as the host target.
fn is_host_target(&self, target: &TargetSelection) -> bool {
/// Checks if the given target is the same as the builder target.
fn is_builder_target(&self, target: &TargetSelection) -> bool {
&self.config.build == target
}
}