diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-04-13 21:58:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-13 21:58:38 +0200 |
| commit | e86de74c27c2721abdadc943ea5cc13f9c53b5c1 (patch) | |
| tree | 8a1857546b1ae3775c6ce8d405b230964888fabc /src | |
| parent | e413c2e77072bbf2803dca63bea239c461159831 (diff) | |
| parent | 1e2f0d2469c2038784e4394b80b7c18be843b3d3 (diff) | |
| download | rust-e86de74c27c2721abdadc943ea5cc13f9c53b5c1.tar.gz rust-e86de74c27c2721abdadc943ea5cc13f9c53b5c1.zip | |
Rollup merge of #110265 - KittyBorgX:master, r=ozkanonur
Automatically update the LLVM submodule for musl target (and other places) Fixes #109987
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/dist.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/llvm.rs | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 8ce220c8647..94e71b89b5c 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -895,6 +895,8 @@ impl Step for Src { /// Creates the `rust-src` installer component fn run(self, builder: &Builder<'_>) -> GeneratedTarball { + builder.update_submodule(&Path::new("src/llvm-project")); + 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 diff --git a/src/bootstrap/llvm.rs b/src/bootstrap/llvm.rs index d123deec354..a893c3a47c9 100644 --- a/src/bootstrap/llvm.rs +++ b/src/bootstrap/llvm.rs @@ -1087,6 +1087,8 @@ impl Step for CrtBeginEnd { /// Build crtbegin.o/crtend.o for musl target. 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"); if builder.config.dry_run() { @@ -1153,6 +1155,8 @@ impl Step for Libunwind { /// Build linunwind.a fn run(self, builder: &Builder<'_>) -> Self::Output { + builder.update_submodule(&Path::new("src/llvm-project")); + if builder.config.dry_run() { return PathBuf::new(); } |
