Upgrade Rust to v1.57.0 and JIT-generate Cargo config file #184
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
giordano
force-pushed
the
mg/rust-toolchain
branch
from
4ce8d5b to
089efe6
Compare
giordano
commented
Dec 1, 2021
src/DockerRunner.jl
Outdated
| @@ -93,9 +93,18 @@ function DockerRunner(workspace_root::String; | |||
| push!(workspaces, compiler_wrapper_path => "/opt/bin") | |||
|
|
|||
| # Generate CMake and Meson files | |||
| generate_toolchain_files!(platform, envs; toolchains_path=toolchains_path) | |||
There was a problem hiding this comment.
Side note, the constructors of the two runners have plenty of duplication 😞
giordano
commented
Dec 1, 2021
src/DockerRunner.jl
Outdated
| cargo_config_file!(cargo_dir) | ||
| # Add to the list of mappings a subdirectory of ${CARGO_HOME}, whose content | ||
| # will be put in ${CARGO_HOME}. | ||
| push!(mappings, cargo_dir => envs["CARGO_HOME"] * "/" * randstring()) |
There was a problem hiding this comment.
Do we want to preserve the mappings argument and create a copy of it, instead of overwriting it? I don't think this argument is super critical though.
giordano
force-pushed
the
mg/rust-toolchain
branch
2 times, most recently
from
4d59185 to
93eb65b
Compare
giordano
commented
Dec 2, 2021
This was referenced Dec 2, 2021
giordano
changed the title
This will replace the file we currently hard-code in the Rust compiler shard.
giordano
force-pushed
the
mg/rust-toolchain
branch
from
2461cd3 to
a1c706e
Compare
giordano
changed the title
giordano
force-pushed
the
mg/rust-toolchain
branch
from
e540446 to
3d79f91
Compare
giordano
force-pushed
the
mg/rust-toolchain
branch
from
3d79f91 to
1fac6ba
Compare
|
Alright, tests in JuliaPackaging/BinaryBuilder.jl#1121 are looking great, I'm going ahead and merging this. We may finally have a working Rust toolchain |
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 will replace the file we currently hard-code in the Rust compiler shard.
PR to update Rust toolchain build script: JuliaPackaging/Yggdrasil#3992