use rustc-build-sysroot instead of xargo #2564
Merged
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
RalfJung
force-pushed
the
no-more-xargo
branch
2 times, most recently
from
b3c6bc8
to
8694aa6
Compare
This comment was marked as resolved.
This comment was marked as resolved.
RalfJung
force-pushed
the
no-more-xargo
branch
from
8694aa6
to
38c3eba
Compare
RalfJung
force-pushed
the
no-more-xargo
branch
from
38c3eba
to
a773d47
Compare
|
x.py build looks good locally. :) |
This was referenced Sep 26, 2022
|
@bors r+ |
|
☀️ Test successful - checks-actions |
RalfJung
added a commit
to RalfJung/miri
that referenced
this pull request
Oct 2, 2022
teskje
added a commit
to teskje/materialize
that referenced
this pull request
Jan 4, 2023
Miri does not install xargo anymore [0], so copying xargo binaries fails. But it also isn't needed anymore, so those lines can simply be removed. [0]: rust-lang/miri#2564
sjwiesman
pushed a commit
to sjwiesman/materialize
that referenced
this pull request
Jan 4, 2023
Miri does not install xargo anymore [0], so copying xargo binaries fails. But it also isn't needed anymore, so those lines can simply be removed. [0]: rust-lang/miri#2564
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.
This uses my crate https://github.com/RalfJung/rustc-build-sysroot instead of xargo to do the sysroot builds. That has the advantage of simplifying the Miri setup process and saving significant amounts of CI time for Miri users (since they don't have to build xargo from source all the time). Also xargo has a lot more functionality than we need so this should be easier to maintain and tweak for our needs.
With this, Miri no longer honors the
XARGO_RUST_SRCenv var to determine where the standard library sources are taken from. The README anyway says to useMIRI_LIB_SRCwhich will still work.TODO: