Skip to content

Commit 904fa71

Browse files
committed
Use stable Rust for ppc64le musl
1 parent de5c7f7 commit 904fa71

File tree

6 files changed

+4
-293
lines changed

6 files changed

+4
-293
lines changed

.github/workflows/Build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,10 @@ jobs:
209209
TARGET: i686-unknown-linux-musl
210210
RUST_MUSL_MAKE_CONFIG: config.mak
211211
TOOLCHAIN: stable
212+
- IMAGE_TAG: powerpc64le-musl
213+
TARGET: powerpc64le-unknown-linux-musl
214+
RUST_MUSL_MAKE_CONFIG: config.mak
215+
TOOLCHAIN: stable
212216
- IMAGE_TAG: mips-musl
213217
TARGET: mips-unknown-linux-musl
214218
RUST_MUSL_MAKE_CONFIG: config.mak
@@ -225,10 +229,6 @@ jobs:
225229
TARGET: mipsel-unknown-linux-musl
226230
RUST_MUSL_MAKE_CONFIG: config.mak
227231
TOOLCHAIN: nightly
228-
- IMAGE_TAG: powerpc64le-musl
229-
TARGET: powerpc64le-unknown-linux-musl
230-
RUST_MUSL_MAKE_CONFIG: config.mak
231-
TOOLCHAIN: nightly
232232
- IMAGE_TAG: s390x-musl
233233
TARGET: s390x-unknown-linux-musl
234234
RUST_MUSL_MAKE_CONFIG: config.mak

Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ RUN echo "[target.$TARGET]\nlinker = \"$TARGET-gcc\"\n" > /root/.cargo/config
123123
ADD Xargo.toml /tmp/Xargo.toml
124124
ADD s390x-unwind.patch /tmp/s390x-unwind.patch
125125
ADD build-std.sh .
126-
COPY compile-libunwind /tmp/compile-libunwind
127126
RUN bash build-std.sh
128127

129128
ENV RUSTUP_HOME=/root/.rustup

build-std.sh

-7
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,4 @@ then
2727
cd ..
2828
rm -rf /root/.xargo /root/.cargo/registry /root/.cargo/git custom-std
2929

30-
# compile libunwind
31-
if [[ "$TARGET" = "powerpc64le-unknown-linux-musl" ]]
32-
then
33-
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
34-
cp out/libunwind*.a "/root/.rustup/toolchains/$TOOLCHAIN-$HOST/lib/rustlib/$TARGET/lib/"
35-
rm -rf out /tmp/compile-libunwind
36-
fi
3730
fi

compile-libunwind/Cargo.lock

-96
This file was deleted.

compile-libunwind/Cargo.toml

-10
This file was deleted.

compile-libunwind/src/main.rs

-175
This file was deleted.

0 commit comments

Comments
 (0)