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

Move to rustlib directory

Browse source
This commit is contained in:
Antoni Boucher 2025-11-29 11:09:23 -05:00
parent 2a88ea1892
commit 2a74c626d6
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_codegen_gcc/src/lib.rs
View file

@ -182,8 +182,9 @@ pub struct GccCodegenBackend {
static LTO_SUPPORTED: AtomicBool = AtomicBool::new(false);
fn libgccjit_path(sysroot_path: &Path, target_triple: &str) -> PathBuf {
let sysroot_lib_dir = sysroot_path.join("lib");
sysroot_lib_dir.join(target_triple).join("libgccjit.so")
let sysroot_lib_dir = sysroot_path.join("lib").join("rustlib");
let libgccjit_target_lib_file =
sysroot_lib_dir.join(target_triple).join("lib").join("libgccjit.so");
}
fn load_libgccjit_if_needed(sysroot_path: &Path, target_triple: &str) {

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

@ -47,7 +47,7 @@ impl GccOutput {
format!("Cannot find libgccjit at {}", self.libgccjit.display())
);
let dest_dir = directory.join(self.target);
let dest_dir = directory.join("rustlib").join(self.target).join("lib");
t!(fs::create_dir_all(&dest_dir));
let dst = dest_dir.join(target_filename);
builder.copy_link(&actual_libgccjit_path, &dst, FileType::NativeLibrary);