Skip to content

Commit 38fc116

Browse files
committed
Store libgccjit.so in a lib directory in the GCC CI tarball
1 parent 34272a5 commit 38fc116

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/bootstrap/src/core/build_steps/dist.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2481,7 +2481,7 @@ impl Step for Gcc {
24812481
fn run(self, builder: &Builder<'_>) -> Self::Output {
24822482
let tarball = Tarball::new(builder, "gcc", &self.target.triple);
24832483
let output = builder.ensure(super::gcc::Gcc { target: self.target });
2484-
tarball.add_file(output.libgccjit, ".", 0o644);
2484+
tarball.add_file(output.libgccjit, "lib", 0o644);
24852485
tarball.generate()
24862486
}
24872487
}

src/bootstrap/src/core/build_steps/gcc.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ fn try_download_gcc(builder: &Builder<'_>, target: TargetSelection) -> Option<Pa
115115
t!(gcc_stamp.write());
116116
}
117117

118-
// FIXME: put libgccjit.so into a lib directory in dist::Gcc
119-
let libgccjit = root.join("libgccjit.so");
118+
let libgccjit = root.join("lib").join("libgccjit.so");
120119
create_lib_alias(builder, &libgccjit);
121120
Some(libgccjit)
122121
}

0 commit comments

Comments
 (0)