Skip to content

Commit 23b3827

Browse files
committed
ci: add support for MIPS64 musl targets
1 parent 084edc4 commit 23b3827

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

src/bootstrap/configure.py

+4
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ def v(*args):
133133
"mips-unknown-linux-musl install directory")
134134
v("musl-root-mipsel", "target.mipsel-unknown-linux-musl.musl-root",
135135
"mipsel-unknown-linux-musl install directory")
136+
v("musl-root-mips64", "target.mips64-unknown-linux-muslabi64.musl-root",
137+
"mips64-unknown-linux-muslabi64 install directory")
138+
v("musl-root-mips64el", "target.mips64el-unknown-linux-muslabi64.musl-root",
139+
"mips64el-unknown-linux-muslabi64 install directory")
136140
v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
137141
"rootfs in qemu testing, you probably don't want to use this")
138142
v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",

src/ci/docker/dist-various-1/Dockerfile

+16
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1515
g++-arm-linux-gnueabi \
1616
g++-arm-linux-gnueabihf \
1717
g++-aarch64-linux-gnu \
18+
g++-mips64-linux-gnuabi64 \
19+
g++-mips64el-linux-gnuabi64 \
1820
gcc-sparc64-linux-gnu \
1921
libc6-dev-sparc64-cross \
2022
bzip2 \
@@ -77,6 +79,14 @@ RUN env \
7779
CC=mipsel-openwrt-linux-gcc \
7880
CXX=mipsel-openwrt-linux-g++ \
7981
bash musl.sh mipsel && \
82+
env \
83+
CC=mips64-linux-gnuabi64-gcc \
84+
CXX=mips64-linux-gnuabi64-g++ \
85+
bash musl.sh mips64 && \
86+
env \
87+
CC=mips64el-linux-gnuabi64-gcc \
88+
CXX=mips64el-linux-gnuabi64-g++ \
89+
bash musl.sh mips64el && \
8090
rm -rf /build/*
8191

8292
# FIXME(mozilla/sccache#235) this shouldn't be necessary but is currently
@@ -97,6 +107,8 @@ ENV TARGETS=$TARGETS,wasm32-unknown-emscripten
97107
ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd
98108
ENV TARGETS=$TARGETS,mips-unknown-linux-musl
99109
ENV TARGETS=$TARGETS,mipsel-unknown-linux-musl
110+
ENV TARGETS=$TARGETS,mips64-unknown-linux-muslabi64
111+
ENV TARGETS=$TARGETS,mips64el-unknown-linux-muslabi64
100112
ENV TARGETS=$TARGETS,arm-unknown-linux-musleabi
101113
ENV TARGETS=$TARGETS,arm-unknown-linux-musleabihf
102114
ENV TARGETS=$TARGETS,armv5te-unknown-linux-gnueabi
@@ -125,6 +137,8 @@ ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf
125137

126138
ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
127139
CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \
140+
CC_mips64el_unknown_linux_muslabi64=mips64el-linux-gnuabi64-gcc \
141+
CC_mips64_unknown_linux_muslabi64=mips64-linux-gnuabi64-gcc \
128142
CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
129143
CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \
130144
CC_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
@@ -139,6 +153,8 @@ ENV RUST_CONFIGURE_ARGS \
139153
--musl-root-aarch64=/musl-aarch64 \
140154
--musl-root-mips=/musl-mips \
141155
--musl-root-mipsel=/musl-mipsel \
156+
--musl-root-mips64=/musl-mips64 \
157+
--musl-root-mips64el=/musl-mips64el \
142158
--disable-docs
143159

144160
ENV SCRIPT \

src/tools/build-manifest/src/main.rs

+2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ static TARGETS: &[&str] = &[
9090
"mips-unknown-linux-gnu",
9191
"mips-unknown-linux-musl",
9292
"mips64-unknown-linux-gnuabi64",
93+
"mips64-unknown-linux-muslabi64",
9394
"mips64el-unknown-linux-gnuabi64",
95+
"mips64el-unknown-linux-muslabi64",
9496
"mipsisa32r6-unknown-linux-gnu",
9597
"mipsisa32r6el-unknown-linux-gnu",
9698
"mipsisa64r6-unknown-linux-gnuabi64",

0 commit comments

Comments
 (0)