From e4dad85a1c8714c691fa390b62f572ce21bc58de Mon Sep 17 00:00:00 2001 From: messense Date: Sat, 24 Sep 2022 13:02:48 +0800 Subject: [PATCH] Add powerpc64-unknown-linux-musl target --- .github/workflows/Build.yml | 4 ++++ README.md | 1 + build-std.sh | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 2c89258..16d3957 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -222,6 +222,10 @@ jobs: TARGET: mipsel-unknown-linux-musl RUST_MUSL_MAKE_CONFIG: config.mak TOOLCHAIN: stable + - IMAGE_TAG: powerpc64-musl + TARGET: powerpc64-unknown-linux-musl + RUST_MUSL_MAKE_CONFIG: config.mak + TOOLCHAIN: nightly - IMAGE_TAG: powerpc64le-musl TARGET: powerpc64le-unknown-linux-musl RUST_MUSL_MAKE_CONFIG: config.mak diff --git a/README.md b/README.md index ba8ef1e..6bd7965 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Currently we have the following [prebuilt Docker images on Docker Hub](https://h | stable | mipsel-unknown-linux-musl | mipsel-musl | | stable | mips64-unknown-linux-muslabi64 | mips64-muslabi64 | | stable | mips64el-unknown-linux-muslabi64 | mips64el-muslabi64 | +| nightly | powerpc64-unknown-linux-musl | powerpc64-musl | | nightly | powerpc64le-unknown-linux-musl | powerpc64le-musl | | stable | x86\_64-unknown-linux-musl | x86\_64-musl | diff --git a/build-std.sh b/build-std.sh index d06a07d..1647bcd 100755 --- a/build-std.sh +++ b/build-std.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -if [[ "$TARGET" = "powerpc64le-unknown-linux-musl" || "$TARGET" = "s390x-unknown-linux-musl" ]] +if [[ "$TARGET" = powerpc64* || "$TARGET" = "s390x-unknown-linux-musl" ]] then export CARGO_NET_GIT_FETCH_WITH_CLI=true export CARGO_UNSTABLE_SPARSE_REGISTRY=true @@ -28,7 +28,7 @@ then rm -rf /root/.xargo /root/.cargo/registry /root/.cargo/git custom-std # compile libunwind - if [[ "$TARGET" = "powerpc64le-unknown-linux-musl" ]] + if [[ "$TARGET" = powerpc64* ]] then cargo run --manifest-path /tmp/compile-libunwind/Cargo.toml -- --target "$TARGET" "/root/.rustup/toolchains/$TOOLCHAIN-$HOST/lib/rustlib/src/rust/src/llvm-project/libunwind" out cp out/libunwind*.a "/root/.rustup/toolchains/$TOOLCHAIN-$HOST/lib/rustlib/$TARGET/lib/"