Fix rustbuild per-target musl root #36972
Conversation
In rust-lang#36292, support was added to target musl libc for ARM targets using rustbuild. Specifically, that change allowed the addition of per-target "musl-root" options in the rustbuild config.toml so that multiple targets depending on musl could be built. However, that implementation contained a couple of omissions: the musl-root option was added to the config, but was never added to the TOML parsing, and therefore was not actually being loaded from config.toml. This commit rectifies that and allows successful building of musl-based ARM targets.
The previous panic message delivered when a musl target was specified but musl-root was not specified incorrectly instructed the user to add the musl-root key to the "build" section of config.toml. The key actually needs to be added to the "rust" section.
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
@bors: r+ Nice! Do you have those docker images on hand to share? We may be trying to get these targets up and running soon :) |
|
📌 Commit 7937f6c has been approved by |
|
I just put up the Dockerfile at https://github.com/nastevens/docker-rust-arm-musl - it'd be awesome if it were useful. I'm running a build right now with all three ARM targets and will push that to docker hub when it's done (i.e. tomorrow - it took forever with just one target...) |
|
Docker image is pushed: https://hub.docker.com/r/nastevens/arm-musl-rust/. Be forewarned - it is huge, around 4GB. I need to go back and refactor for size. With that image all three arm targets work. |
|
Thanks @nastevens! |
…musl-root, r=alexcrichton Fix rustbuild per-target musl root In rust-lang#36292, support was added to target musl libc for ARM targets using rustbuild. Specifically, that change allowed the addition of per-target `musl-root` options in the rustbuild `config.toml` so that multiple targets depending on musl could be built. However, that implementation contained a couple of omissions: the `musl-root` option was added to the config, but was never added to the TOML parsing, and therefore was not actually being loaded from `config.toml`. This PR rectifies that. Using these changes and a heavily modified version of the buildbot Docker container, I have been able to build rust targeting `armv7-unknown-linux-musleabihf` and have successfully run the binaries on a Raspberry Pi 3. I'm also planning to test `arm-unknown-linux-musleabi` and `arm-unknown-linux-musleabihf` systems, but have no reason to believe that this change would not simply work on those targets.
In #36292, support was added to target musl libc for ARM targets using rustbuild. Specifically, that change allowed the addition of per-target
musl-rootoptions in the rustbuildconfig.tomlso that multiple targets depending on musl could be built. However, that implementation contained a couple of omissions: themusl-rootoption was added to the config, but was never added to the TOML parsing, and therefore was not actually being loaded fromconfig.toml. This PR rectifies that.Using these changes and a heavily modified version of the buildbot Docker container, I have been able to build rust targeting
armv7-unknown-linux-musleabihfand have successfully run the binaries on a Raspberry Pi 3. I'm also planning to testarm-unknown-linux-musleabiandarm-unknown-linux-musleabihfsystems, but have no reason to believe that this change would not simply work on those targets.