Skip to content

Commit 60ea265

Browse files
authored
Rollup merge of #83350 - jyn514:llvm-version, r=Mark-Simulacrum
Download a more recent LLVM version if `src/version` is modified When bumping the bootstrap version, the name of the generated LLVM shared object file is changed, even though it's the same contents as before. If bootstrap tries to use an older version, it will get linking errors: ``` Building rustdoc for stage1 (x86_64-unknown-linux-gnu) Compiling rustdoc-tool v0.0.0 (/home/joshua/rustc/src/tools/rustdoc) error: linking with `cc` failed: exit code: 1 | = note: "cc" "-Wl,--as-needed" ... lots of args ... = note: /usr/bin/ld: cannot find -lLLVM-12-rust-1.53.0-nightly clang: error: linker command failed with exit code 1 (use -v to see invocation) error: could not compile `rustdoc-tool` ``` Helps with #81930.
2 parents 4e456fc + 4002171 commit 60ea265

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Diff for: src/bootstrap/bootstrap.py

+2
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,8 @@ def download_stage0(self):
463463
"--",
464464
"{}/src/llvm-project".format(top_level),
465465
"{}/src/bootstrap/download-ci-llvm-stamp".format(top_level),
466+
# the LLVM shared object file is named `LLVM-12-rust-{version}-nightly`
467+
"{}/src/version".format(top_level)
466468
]).decode(sys.getdefaultencoding()).strip()
467469
llvm_assertions = self.get_toml('assertions', 'llvm') == 'true'
468470
llvm_root = self.llvm_root()

0 commit comments

Comments
 (0)