bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #110265 - KittyBorgX:master, r=ozkanonur

Browse source 
Automatically update the LLVM submodule for musl target (and other places)

Fixes #109987
This commit is contained in:
Matthias Krüger 2023-04-13 21:58:38 +02:00 • committed by GitHub
commit e86de74c27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/dist.rs
View file

@ -895,6 +895,8 @@ impl Step for Src {
/// Creates the `rust-src` installer component /// Creates the `rust-src` installer component
fn run(self, builder: &Builder<'_>) -> GeneratedTarball { fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
builder.update_submodule(&Path::new("src/llvm-project"));
let tarball = Tarball::new_targetless(builder, "rust-src"); let tarball = Tarball::new_targetless(builder, "rust-src");
// A lot of tools expect the rust-src component to be entirely in this directory, so if you // A lot of tools expect the rust-src component to be entirely in this directory, so if you

4
src/bootstrap/llvm.rs
View file

@ -1087,6 +1087,8 @@ impl Step for CrtBeginEnd {
/// Build crtbegin.o/crtend.o for musl target. /// Build crtbegin.o/crtend.o for musl target.
fn run(self, builder: &Builder<'_>) -> Self::Output { fn run(self, builder: &Builder<'_>) -> Self::Output {
builder.update_submodule(&Path::new("src/llvm-project"));
let out_dir = builder.native_dir(self.target).join("crt"); let out_dir = builder.native_dir(self.target).join("crt");
if builder.config.dry_run() { if builder.config.dry_run() {
@ -1153,6 +1155,8 @@ impl Step for Libunwind {
/// Build linunwind.a /// Build linunwind.a
fn run(self, builder: &Builder<'_>) -> Self::Output { fn run(self, builder: &Builder<'_>) -> Self::Output {
builder.update_submodule(&Path::new("src/llvm-project"));
if builder.config.dry_run() { if builder.config.dry_run() {
return PathBuf::new(); return PathBuf::new();
} }