Skip to content

Commit 54520a3

Browse files
committed
Adjust MIPSEL CI build system changes.
Take MIPSEL out of the GitHub Actions configuration because it fails to link, and because it makes the build matrix too large.
1 parent ce24e18 commit 54520a3

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ jobs:
247247
host_os: ubuntu-22.04
248248

249249
- target: mipsel-unknown-linux-gnu
250-
host_os: ubuntu-18.04
250+
host_os: ubuntu-22.04
251251

252252
- target: x86_64-pc-windows-gnu
253253
host_os: windows-latest

build.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ const RING_SRCS: &[(&[&str], &str)] = &[
3737
(&[], "crypto/fipsmodule/aes/aes_nohw.c"),
3838
(&[], "crypto/fipsmodule/bn/montgomery.c"),
3939
(&[], "crypto/fipsmodule/bn/montgomery_inv.c"),
40+
(&[], "crypto/fipsmodule/ec/ecp_nistz.c"),
41+
(&[], "crypto/fipsmodule/ec/gfp_p256.c"),
42+
(&[], "crypto/fipsmodule/ec/gfp_p384.c"),
43+
(&[], "crypto/fipsmodule/ec/p256.c"),
4044
(&[], "crypto/limbs/limbs.c"),
4145
(&[], "crypto/mem.c"),
4246
(&[], "crypto/poly1305/poly1305.c"),
4347

4448
(&[AARCH64, ARM, X86_64, X86], "crypto/crypto.c"),
45-
(&[AARCH64, ARM, X86_64, X86], "crypto/fipsmodule/ec/ecp_nistz.c"),
46-
(&[AARCH64, ARM, X86_64, X86], "crypto/fipsmodule/ec/gfp_p256.c"),
47-
(&[AARCH64, ARM, X86_64, X86], "crypto/fipsmodule/ec/gfp_p384.c"),
48-
(&[AARCH64, ARM, X86_64, X86], "crypto/fipsmodule/ec/p256.c"),
4949

5050
(&[X86_64, X86], "crypto/cpu_intel.c"),
5151

mk/cargo.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ IFS=$'\n\t'
2020
rustflags_self_contained="-Clink-self-contained=yes -Clinker=rust-lld"
2121
qemu_aarch64="qemu-aarch64 -L /usr/aarch64-linux-gnu"
2222
qemu_arm="qemu-arm -L /usr/arm-linux-gnueabihf"
23-
qemu_mipsel="qemu-system-mipsel -L /usr/mipsel-linux-gnu"
23+
qemu_mipsel="qemu-mipsel -L /usr/mipsel-linux-gnu"
2424

2525
# Avoid putting the Android tools in `$PATH` because there are tools in this
2626
# directory like `clang` that would conflict with the same-named tools that may

mk/install-build-tools.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ case $target in
7474
;;
7575
--target=mipsel-unknown-linux-gnu)
7676
install_packages \
77-
qemu-user \
7877
gcc-mipsel-linux-gnu \
79-
libc6-dev-mipsel-cross
78+
libc6-dev-mipsel-cross \
79+
qemu-user
8080
;;
8181
--target=wasm32-unknown-unknown)
8282
cargo install wasm-bindgen-cli --bin wasm-bindgen-test-runner

0 commit comments

Comments
 (0)