Skip to content

Commit e86de74

Browse files
authoredApr 13, 2023
Rollup merge of #110265 - KittyBorgX:master, r=ozkanonur
Automatically update the LLVM submodule for musl target (and other places) Fixes #109987
2 parents e413c2e + 1e2f0d2 commit e86de74

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed
 

‎src/bootstrap/dist.rs

+2
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,8 @@ impl Step for Src {
895895

896896
/// Creates the `rust-src` installer component
897897
fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
898+
builder.update_submodule(&Path::new("src/llvm-project"));
899+
898900
let tarball = Tarball::new_targetless(builder, "rust-src");
899901

900902
// A lot of tools expect the rust-src component to be entirely in this directory, so if you

‎src/bootstrap/llvm.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1087,6 +1087,8 @@ impl Step for CrtBeginEnd {
10871087

10881088
/// Build crtbegin.o/crtend.o for musl target.
10891089
fn run(self, builder: &Builder<'_>) -> Self::Output {
1090+
builder.update_submodule(&Path::new("src/llvm-project"));
1091+
10901092
let out_dir = builder.native_dir(self.target).join("crt");
10911093

10921094
if builder.config.dry_run() {
@@ -1153,6 +1155,8 @@ impl Step for Libunwind {
11531155

11541156
/// Build linunwind.a
11551157
fn run(self, builder: &Builder<'_>) -> Self::Output {
1158+
builder.update_submodule(&Path::new("src/llvm-project"));
1159+
11561160
if builder.config.dry_run() {
11571161
return PathBuf::new();
11581162
}

0 commit comments

Comments
 (0)