Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add aarch64-unknown-linux-musl support #2493

Merged
merged 2 commits into from
Sep 30, 2020
Merged

Add aarch64-unknown-linux-musl support #2493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1516234
Add aarch64-unknown-linux-musl support
Gelbpunkt Sep 17, 2020
629b75c
run workflow generation script
Gelbpunkt Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/linux-builds-on-stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
- armv7-unknown-linux-gnueabihf
- aarch64-linux-android
- aarch64-unknown-linux-gnu # skip-pr
- aarch64-unknown-linux-musl # skip-pr skip-master
- powerpc64-unknown-linux-gnu # skip-pr
- x86_64-unknown-linux-musl # skip-pr
- i686-unknown-linux-gnu # skip-pr skip-master
Expand Down
1 change: 1 addition & 0 deletions ci/actions-templates/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ system.
| armv7-unknown-linux-gnueabihf | Yes | Two | Yes | Yes |
| aarch64-linux-android | Yes | Two | Yes | Yes |
| aarch64-unknown-linux-gnu | Yes | Two | No | Yes |
| aarch64-unknown-linux-musl | Yes | Two | No | Yes |
| powerpc64-unknown-linux-gnu | Yes | Two | No | Yes |
| x86_64-unknown-linux-musl | Yes | Two | No | Yes |
| i686-unknown-linux-gnu | Yes | One | No | No |
Expand Down
1 change: 1 addition & 0 deletions ci/actions-templates/linux-builds-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- armv7-unknown-linux-gnueabihf
- aarch64-linux-android
- aarch64-unknown-linux-gnu # skip-pr
- aarch64-unknown-linux-musl # skip-pr skip-master
- powerpc64-unknown-linux-gnu # skip-pr
- x86_64-unknown-linux-musl # skip-pr
- i686-unknown-linux-gnu # skip-pr skip-master
Expand Down
2 changes: 2 additions & 0 deletions ci/cloudfront-invalidation.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ rustup/dist/aarch64-linux-android/rustup-init
rustup/dist/aarch64-linux-android/rustup-init.sha256
rustup/dist/aarch64-unknown-linux-gnu/rustup-init
rustup/dist/aarch64-unknown-linux-gnu/rustup-init.sha256
rustup/dist/aarch64-unknown-linux-musl/rustup-init
rustup/dist/aarch64-unknown-linux-musl/rustup-init.sha256
rustup/dist/arm-linux-androideabi/rustup-init
rustup/dist/arm-linux-androideabi/rustup-init.sha256
rustup/dist/arm-unknown-linux-gnueabi/rustup-init
Expand Down
5 changes: 5 additions & 0 deletions ci/docker/aarch64-unknown-linux-musl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM rust-aarch64-unknown-linux-musl

ENV CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc \
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-gcc \
RUSTFLAGS="-C target-feature=+crt-static -C link-arg=-lgcc"
1 change: 1 addition & 0 deletions ci/fetch-rust-docker.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ LOCAL_DOCKER_TAG="rust-$TARGET"
# Use images from rustc master
case "$TARGET" in
aarch64-unknown-linux-gnu) image=dist-aarch64-linux ;;
aarch64-unknown-linux-musl) image=dist-arm-linux ;;
arm-unknown-linux-gnueabi) image=dist-arm-linux ;;
arm-unknown-linux-gnueabihf) image=dist-armhf-linux ;;
armv7-unknown-linux-gnueabihf) image=dist-armv7-linux ;;
Expand Down
1 change: 1 addition & 0 deletions doc/src/installation/other.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ choice:

- [aarch64-linux-android](https://static.rust-lang.org/rustup/dist/aarch64-linux-android/rustup-init)
- [aarch64-unknown-linux-gnu](https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init)
- [aarch64-unknown-linux-musl](https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-musl/rustup-init)
- [arm-linux-androideabi](https://static.rust-lang.org/rustup/dist/arm-linux-androideabi/rustup-init)
- [arm-unknown-linux-gnueabi](https://static.rust-lang.org/rustup/dist/arm-unknown-linux-gnueabi/rustup-init)
- [arm-unknown-linux-gnueabihf](https://static.rust-lang.org/rustup/dist/arm-unknown-linux-gnueabihf/rustup-init)
Expand Down
12 changes: 8 additions & 4 deletions src/dist/dist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ static LIST_ENVS: &[&str] = &[
const TRIPLE_X86_64_UNKNOWN_LINUX: &str = "x86_64-unknown-linux-gnu";
#[cfg(all(not(windows), target_env = "musl"))]
const TRIPLE_X86_64_UNKNOWN_LINUX: &str = "x86_64-unknown-linux-musl";
#[cfg(all(not(windows), not(target_env = "musl")))]
const TRIPLE_AARCH64_UNKNOWN_LINUX: &str = "aarch64-unknown-linux-gnu";
#[cfg(all(not(windows), target_env = "musl"))]
const TRIPLE_AARCH64_UNKNOWN_LINUX: &str = "aarch64-unknown-linux-musl";

// MIPS platforms don't indicate endianness in uname, however binaries only
// run on boxes with the same endianness, as expected.
Expand Down Expand Up @@ -245,7 +249,7 @@ impl TargetTriple {
(b"Linux", b"arm") => Some("arm-unknown-linux-gnueabi"),
(b"Linux", b"armv7l") => Some("armv7-unknown-linux-gnueabihf"),
(b"Linux", b"armv8l") => Some("armv7-unknown-linux-gnueabihf"),
(b"Linux", b"aarch64") => Some("aarch64-unknown-linux-gnu"),
(b"Linux", b"aarch64") => Some(TRIPLE_AARCH64_UNKNOWN_LINUX),
(b"Darwin", b"x86_64") => Some("x86_64-apple-darwin"),
(b"Darwin", b"i686") => Some("i686-apple-darwin"),
(b"FreeBSD", b"x86_64") => Some("x86_64-unknown-freebsd"),
Expand Down Expand Up @@ -373,10 +377,10 @@ impl PartialToolchainDesc {
let env = if self.target.os.is_some() {
self.target.env
} else {
self.target.env.or_else(|| host_env)
self.target.env.or(host_env)
};
let arch = self.target.arch.unwrap_or_else(|| host_arch);
let os = self.target.os.unwrap_or_else(|| host_os);
let arch = self.target.arch.unwrap_or(host_arch);
let os = self.target.os.unwrap_or(host_os);

let trip = if let Some(env) = env {
format!("{}-{}-{}", arch, os, env)
Expand Down