bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Create libgccjit.so.0 alias also for CI-downloaded GCC

Browse source
This commit is contained in:
Jakub Beránek 2025-03-12 13:14:11 +01:00
parent 52daa7d835
commit c4371786d6
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/bootstrap/src/core/build_steps/gcc.rs
View file

@ -63,11 +63,7 @@ impl Step for Gcc {
}
build_gcc(&metadata, builder, target);
let lib_alias = metadata.install_dir.join("lib/libgccjit.so.0");
if !lib_alias.exists() {
t!(builder.symlink_file(&libgccjit_path, lib_alias));
}
create_lib_alias(builder, &libgccjit_path);
t!(metadata.stamp.write());
@ -75,6 +71,15 @@ impl Step for Gcc {
}
}
/// Creates a libgccjit.so.0 alias next to libgccjit.so if it does not
/// already exist
fn create_lib_alias(builder: &Builder<'_>, libgccjit: &PathBuf) {
let lib_alias = libgccjit.parent().unwrap().join("libgccjit.so.0");
if !lib_alias.exists() {
t!(builder.symlink_file(libgccjit, lib_alias));
}
}
pub struct Meta {
stamp: BuildStamp,
out_dir: PathBuf,
@ -109,8 +114,11 @@ fn try_download_gcc(builder: &Builder<'_>, target: TargetSelection) -> Option<Pa
builder.config.download_ci_gcc(&sha, &root);
t!(gcc_stamp.write());
}
// FIXME: put libgccjit.so into a lib directory in dist::Gcc
Some(root.join("libgccjit.so"))
let libgccjit = root.join("libgccjit.so");
create_lib_alias(builder, &libgccjit);
Some(libgccjit)
}
#[cfg(test)]