various download-rustc fixes #113373
Merged
various download-rustc fixes #113373
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, it would always treat download-rustc as set to false, which made bootstrap issues with download-rustc hard to debug.
this was a pre-existing latent bug, we just didn't have any CI builders exercising it.
fixes the following errors:
```
---- [ui] tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs#opt1 stdout ----
error in revision `opt1`: test compilation failed although it shouldn't!
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=i686-unknown-linux-gnu" "--cfg" "opt1" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--remap-path-prefix=/checkout/tests/ui=fake-test-src-base" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/sanitize/new-llvm-pass-manager-thin-lto.opt1/a" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/i686-unknown-linux-gnu/native/rust-test-helpers" "-Clinker=x86_64-linux-gnu-gcc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/sanitize/new-llvm-pass-manager-thin-lto.opt1/auxiliary" "-Zsanitizer=address" "-Clto=thin" "-Copt-level=1"
--- stderr -------------------------------
error: linking with `x86_64-linux-gnu-gcc` failed: exit status: 1
= note: x86_64-linux-gnu-gcc: error: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/i686-unknown-linux-gnu/lib/librustc-nightly_rt.asan.a: No such file or directory
failures:
[ui] tests/ui/sanitize/badfree.rs
[ui] tests/ui/sanitize/address.rs
[ui] tests/ui/sanitize/use-after-scope.rs
[ui] tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs#opt0
[ui] tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs#opt1
```
by using `rustc-builds-alt` if download-rustc is set this also changes the download code to use a separate build/cache/ directory and .rustc-stamp stamp file depending on whether assertions are enabled.
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
albertlarsan68
added
S-waiting-on-author
…-error.rs Not only are they a pain to update, but they differ depending on whether `parallel-rustc` is enabled or not
This was not the correct fix. The problem was two-fold: - `download-rustc` didn't respect `llvm.assertions` - `rust-dev` was missing a bump to `download-ci-llvm-stamp` The first is fixed in this PR and the latter was fixed a while ago. Revert this change to avoid breaking `rpath = false`.
jyn514
force-pushed
the
download-rustc-fixes
branch
from
9841741
to
67b5990
Compare
|
thanks for the review! @bors r=albertlarsan68 |
bors
added
S-waiting-on-bors
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Jul 12, 2023
…ertlarsan68 various download-rustc fixes separated out from rust-lang#112143 because it keeps getting stuck in limbo. best reviewed commit-by-commit
This was referenced Jul 12, 2023
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 12, 2023
…kingjubilee Rollup of 5 pull requests Successful merges: - rust-lang#113373 (various download-rustc fixes) - rust-lang#113385 (style-guide: Fix chain example to match rustfmt behavior) - rust-lang#113567 (While let suggestion will work for closure body) - rust-lang#113579 (Revert "fix: 🐛 etc/bash_complettion -> src/etc/... to avoid copy …) - rust-lang#113595 (Use constants from object crate) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
separated out from #112143 because it keeps getting stuck in limbo.
best reviewed commit-by-commit