@@ -29,8 +29,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2929 g++-arm-linux-gnueabi \
3030 g++-arm-linux-gnueabihf \
3131 g++-aarch64-linux-gnu \
32- g++-mips64-linux-gnuabi64 \
33- g++-mips64el-linux-gnuabi64 \
3432 gcc-arm-none-eabi \
3533 gcc-sparc64-linux-gnu \
3634 libc6-dev-sparc64-cross \
@@ -48,12 +46,6 @@ WORKDIR /build
4846COPY host-x86_64/dist-various-1/install-x86_64-redox.sh /build
4947RUN ./install-x86_64-redox.sh
5048
51- COPY host-x86_64/dist-various-1/install-mips-musl.sh /build
52- RUN ./install-mips-musl.sh
53-
54- COPY host-x86_64/dist-various-1/install-mipsel-musl.sh /build
55- RUN ./install-mipsel-musl.sh
56-
5749COPY host-x86_64/dist-various-1/install-aarch64-none-elf.sh /build
5850RUN ./install-aarch64-none-elf.sh
5951
@@ -76,32 +68,7 @@ RUN env \
7668 env \
7769 CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv7-a+fp" \
7870 CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv7-a+fp" \
79- bash musl.sh armv7hf && \
80- env \
81- CC=mips-openwrt-linux-gcc \
82- CXX=mips-openwrt-linux-g++ \
83- bash musl.sh mips && \
84- env \
85- CC=mipsel-openwrt-linux-gcc \
86- CXX=mipsel-openwrt-linux-g++ \
87- bash musl.sh mipsel && \
88- env \
89- CC=mips64-linux-gnuabi64-gcc \
90- CXX=mips64-linux-gnuabi64-g++ \
91- bash musl.sh mips64 && \
92- env \
93- CC=mips64el-linux-gnuabi64-gcc \
94- CXX=mips64el-linux-gnuabi64-g++ \
95- bash musl.sh mips64el && \
96- rm -rf /build/*
97-
98- # FIXME(mozilla/sccache#235) this shouldn't be necessary but is currently
99- # necessary to disambiguate the mips compiler with the mipsel compiler. We want
100- # to give these two wrapper scripts (currently identical ones) different hashes
101- # to ensure that sccache understands that they're different compilers.
102- RUN \
103- echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \
104- echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh
71+ bash musl.sh armv7hf
10572
10673ENV RUN_MAKE_TARGETS=thumbv6m-none-eabi
10774ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7m-none-eabi
@@ -110,10 +77,6 @@ ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabihf
11077
11178ENV TARGETS=asmjs-unknown-emscripten
11279ENV TARGETS=$TARGETS,wasm32-unknown-emscripten
113- ENV TARGETS=$TARGETS,mips-unknown-linux-musl
114- ENV TARGETS=$TARGETS,mipsel-unknown-linux-musl
115- ENV TARGETS=$TARGETS,mips64-unknown-linux-muslabi64
116- ENV TARGETS=$TARGETS,mips64el-unknown-linux-muslabi64
11780ENV TARGETS=$TARGETS,arm-unknown-linux-musleabi
11881ENV TARGETS=$TARGETS,arm-unknown-linux-musleabihf
11982ENV TARGETS=$TARGETS,armv5te-unknown-linux-gnueabi
@@ -149,10 +112,6 @@ ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft
149112 CFLAGS_arm_unknown_linux_musleabi="-march=armv6 -marm" \
150113 CFLAGS_arm_unknown_linux_musleabihf="-march=armv6 -marm -mfpu=vfp" \
151114 CFLAGS_armv7_unknown_linux_musleabihf="-march=armv7-a+fp" \
152- CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
153- CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \
154- CC_mips64el_unknown_linux_muslabi64=mips64el-linux-gnuabi64-gcc \
155- CC_mips64_unknown_linux_muslabi64=mips64-linux-gnuabi64-gcc \
156115 CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
157116 CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \
158117 CC_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
@@ -177,10 +136,6 @@ ENV RUST_CONFIGURE_ARGS \
177136 --musl-root-arm=/musl-arm \
178137 --musl-root-armhf=/musl-armhf \
179138 --musl-root-armv7hf=/musl-armv7hf \
180- --musl-root-mips=/musl-mips \
181- --musl-root-mipsel=/musl-mipsel \
182- --musl-root-mips64=/musl-mips64 \
183- --musl-root-mips64el=/musl-mips64el \
184139 --disable-docs
185140
186141ENV SCRIPT \
0 commit comments