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

utilize the unused llvm-tools option

Browse Source 
This field was not functioning as described in its comment in `config.example.toml`.
Also, updated the default value to `true` to keep the bootstrapping behavior as it was before.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
onur-ozkan 2023-12-28 17:27:59 +03:00
parent a815c3b69c
commit 12190e5dd2
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.example.toml
View File

@ -661,7 +661,7 @@
# Indicates whether some LLVM tools, like llvm-objdump, will be made available in the
# sysroot.
#llvm-tools = false
#llvm-tools = true
# Whether to deny warnings in crates
#deny-warnings = true

2
src/bootstrap/src/core/build_steps/compile.rs
View File

@ -1738,7 +1738,7 @@ fn run(self, builder: &Builder<'_>) -> Compiler {
if builder.config.rust_codegen_backends.contains(&INTERNER.intern_str("llvm")) {
let llvm::LlvmResult { llvm_config, .. } =
builder.ensure(llvm::Llvm { target: target_compiler.host });
if !builder.config.dry_run() {
if !builder.config.dry_run() && builder.config.llvm_tools_enabled {
let llvm_bin_dir = output(Command::new(llvm_config).arg("--bindir"));
let llvm_bin_dir = Path::new(llvm_bin_dir.trim());

14
src/bootstrap/src/core/build_steps/dist.rs
View File

@ -2157,12 +2157,14 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
tarball.set_overlay(OverlayKind::LLVM);
tarball.is_preview(true);
// Prepare the image directory
let src_bindir = builder.llvm_out(target).join("bin");
let dst_bindir = format!("lib/rustlib/{}/bin", target.triple);
for tool in LLVM_TOOLS {
let exe = src_bindir.join(exe(tool, target));
tarball.add_file(&exe, &dst_bindir, 0o755);
if builder.config.llvm_tools_enabled {
// Prepare the image directory
let src_bindir = builder.llvm_out(target).join("bin");
let dst_bindir = format!("lib/rustlib/{}/bin", target.triple);
for tool in LLVM_TOOLS {
let exe = src_bindir.join(exe(tool, target));
tarball.add_file(&exe, &dst_bindir, 0o755);
}
}
// Copy libLLVM.so to the target lib dir as well, so the RPATH like

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

@ -1630,7 +1630,7 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
);
}
set(&mut config.llvm_tools_enabled, llvm_tools);
config.llvm_tools_enabled = llvm_tools.unwrap_or(true);
config.rustc_parallel =
parallel_compiler.unwrap_or(config.channel == "dev" || config.channel == "nightly");
config.rustc_default_linker = default_linker;