diff --git a/docker/Dockerfile.aarch64-linux-android b/docker/Dockerfile.aarch64-linux-android index 220e5bc00..1372b35bc 100644 --- a/docker/Dockerfile.aarch64-linux-android +++ b/docker/Dockerfile.aarch64-linux-android @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.aarch64-unknown-freebsd b/docker/Dockerfile.aarch64-unknown-freebsd index a1895d3c3..951b7f165 100644 --- a/docker/Dockerfile.aarch64-unknown-freebsd +++ b/docker/Dockerfile.aarch64-unknown-freebsd @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN echo "export ARCH=aarch64" > /freebsd-arch.sh diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu index 546a827b7..a8f32936d 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-gnu +++ b/docker/Dockerfile.aarch64-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu.centos b/docker/Dockerfile.aarch64-unknown-linux-gnu.centos index 7ad494afb..a4f77be5e 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-gnu.centos +++ b/docker/Dockerfile.aarch64-unknown-linux-gnu.centos @@ -18,9 +18,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - COPY qemu.sh / RUN /qemu.sh aarch64 softmmu diff --git a/docker/Dockerfile.aarch64-unknown-linux-musl b/docker/Dockerfile.aarch64-unknown-linux-musl index 80ce9b64f..3be79a939 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-musl +++ b/docker/Dockerfile.aarch64-unknown-linux-musl @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.arm-linux-androideabi b/docker/Dockerfile.arm-linux-androideabi index 2f990abd1..d60d192e4 100644 --- a/docker/Dockerfile.arm-linux-androideabi +++ b/docker/Dockerfile.arm-linux-androideabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabi b/docker/Dockerfile.arm-unknown-linux-gnueabi index 8c05bb8c9..2d7f272bc 100644 --- a/docker/Dockerfile.arm-unknown-linux-gnueabi +++ b/docker/Dockerfile.arm-unknown-linux-gnueabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabihf b/docker/Dockerfile.arm-unknown-linux-gnueabihf index 8fd0a4cb4..c10ac3419 100644 --- a/docker/Dockerfile.arm-unknown-linux-gnueabihf +++ b/docker/Dockerfile.arm-unknown-linux-gnueabihf @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build ARG VERBOSE diff --git a/docker/Dockerfile.arm-unknown-linux-musleabi b/docker/Dockerfile.arm-unknown-linux-musleabi index bc1390766..1be893c24 100644 --- a/docker/Dockerfile.arm-unknown-linux-musleabi +++ b/docker/Dockerfile.arm-unknown-linux-musleabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.arm-unknown-linux-musleabihf b/docker/Dockerfile.arm-unknown-linux-musleabihf index 0d19ecc74..a9ed9a184 100644 --- a/docker/Dockerfile.arm-unknown-linux-musleabihf +++ b/docker/Dockerfile.arm-unknown-linux-musleabihf @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.armv5te-unknown-linux-gnueabi b/docker/Dockerfile.armv5te-unknown-linux-gnueabi index 0d8cb2ffc..a9e606344 100644 --- a/docker/Dockerfile.armv5te-unknown-linux-gnueabi +++ b/docker/Dockerfile.armv5te-unknown-linux-gnueabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.armv5te-unknown-linux-musleabi b/docker/Dockerfile.armv5te-unknown-linux-musleabi index acba21450..5e4b659ae 100644 --- a/docker/Dockerfile.armv5te-unknown-linux-musleabi +++ b/docker/Dockerfile.armv5te-unknown-linux-musleabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.armv7-linux-androideabi b/docker/Dockerfile.armv7-linux-androideabi index edcfab357..a49c451e9 100644 --- a/docker/Dockerfile.armv7-linux-androideabi +++ b/docker/Dockerfile.armv7-linux-androideabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabi b/docker/Dockerfile.armv7-unknown-linux-gnueabi index c4fd68ab7..2e74ebcef 100644 --- a/docker/Dockerfile.armv7-unknown-linux-gnueabi +++ b/docker/Dockerfile.armv7-unknown-linux-gnueabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabihf b/docker/Dockerfile.armv7-unknown-linux-gnueabihf index 2f63560f9..87de3bffc 100644 --- a/docker/Dockerfile.armv7-unknown-linux-gnueabihf +++ b/docker/Dockerfile.armv7-unknown-linux-gnueabihf @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.armv7-unknown-linux-musleabi b/docker/Dockerfile.armv7-unknown-linux-musleabi index c998e260f..909aaff80 100644 --- a/docker/Dockerfile.armv7-unknown-linux-musleabi +++ b/docker/Dockerfile.armv7-unknown-linux-musleabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.armv7-unknown-linux-musleabihf b/docker/Dockerfile.armv7-unknown-linux-musleabihf index f1008bf88..f88498098 100644 --- a/docker/Dockerfile.armv7-unknown-linux-musleabihf +++ b/docker/Dockerfile.armv7-unknown-linux-musleabihf @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.asmjs-unknown-emscripten b/docker/Dockerfile.asmjs-unknown-emscripten index 2b0a725d5..0da5c9b13 100644 --- a/docker/Dockerfile.asmjs-unknown-emscripten +++ b/docker/Dockerfile.asmjs-unknown-emscripten @@ -8,9 +8,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ libxml2 \ python diff --git a/docker/Dockerfile.i586-unknown-linux-gnu b/docker/Dockerfile.i586-unknown-linux-gnu index e52bc04ee..026c82f91 100644 --- a/docker/Dockerfile.i586-unknown-linux-gnu +++ b/docker/Dockerfile.i586-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.i586-unknown-linux-musl b/docker/Dockerfile.i586-unknown-linux-musl index 7288fa3a1..0d7895fa5 100644 --- a/docker/Dockerfile.i586-unknown-linux-musl +++ b/docker/Dockerfile.i586-unknown-linux-musl @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY musl.sh / diff --git a/docker/Dockerfile.i686-linux-android b/docker/Dockerfile.i686-linux-android index 5992b701d..bee3520d9 100644 --- a/docker/Dockerfile.i686-linux-android +++ b/docker/Dockerfile.i686-linux-android @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build # We could supposedly directly run i686 binaries like we do for x86_64, but diff --git a/docker/Dockerfile.i686-pc-windows-gnu b/docker/Dockerfile.i686-pc-windows-gnu index 39cd101f5..1572b9d63 100644 --- a/docker/Dockerfile.i686-pc-windows-gnu +++ b/docker/Dockerfile.i686-pc-windows-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN dpkg --add-architecture i386 && apt-get update && \ diff --git a/docker/Dockerfile.i686-unknown-freebsd b/docker/Dockerfile.i686-unknown-freebsd index b4c6b8676..881644041 100644 --- a/docker/Dockerfile.i686-unknown-freebsd +++ b/docker/Dockerfile.i686-unknown-freebsd @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN echo "export ARCH=i686" > /freebsd-arch.sh diff --git a/docker/Dockerfile.i686-unknown-linux-gnu b/docker/Dockerfile.i686-unknown-linux-gnu index f76bf1843..28fd9ce2b 100644 --- a/docker/Dockerfile.i686-unknown-linux-gnu +++ b/docker/Dockerfile.i686-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.i686-unknown-linux-musl b/docker/Dockerfile.i686-unknown-linux-musl index bf51fb542..3e4408843 100644 --- a/docker/Dockerfile.i686-unknown-linux-musl +++ b/docker/Dockerfile.i686-unknown-linux-musl @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY musl.sh / diff --git a/docker/Dockerfile.loongarch64-unknown-linux-gnu b/docker/Dockerfile.loongarch64-unknown-linux-gnu index eb79ff43b..fa7139188 100644 --- a/docker/Dockerfile.loongarch64-unknown-linux-gnu +++ b/docker/Dockerfile.loongarch64-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build ARG VERBOSE diff --git a/docker/Dockerfile.loongarch64-unknown-linux-musl b/docker/Dockerfile.loongarch64-unknown-linux-musl index e7bd8891d..a7981e295 100644 --- a/docker/Dockerfile.loongarch64-unknown-linux-musl +++ b/docker/Dockerfile.loongarch64-unknown-linux-musl @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build ARG VERBOSE diff --git a/docker/Dockerfile.mips-unknown-linux-gnu b/docker/Dockerfile.mips-unknown-linux-gnu index 5d5cb2f14..26507486b 100644 --- a/docker/Dockerfile.mips-unknown-linux-gnu +++ b/docker/Dockerfile.mips-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.mips-unknown-linux-musl b/docker/Dockerfile.mips-unknown-linux-musl index 045f4f519..6b0406bc5 100644 --- a/docker/Dockerfile.mips-unknown-linux-musl +++ b/docker/Dockerfile.mips-unknown-linux-musl @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.mips64-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64-unknown-linux-gnuabi64 index 70cc20b42..649bcba04 100644 --- a/docker/Dockerfile.mips64-unknown-linux-gnuabi64 +++ b/docker/Dockerfile.mips64-unknown-linux-gnuabi64 @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.mips64-unknown-linux-muslabi64 b/docker/Dockerfile.mips64-unknown-linux-muslabi64 index a8a0b373b..0722f313b 100644 --- a/docker/Dockerfile.mips64-unknown-linux-muslabi64 +++ b/docker/Dockerfile.mips64-unknown-linux-muslabi64 @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 index cc8da8e1a..b7d0e7350 100644 --- a/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 +++ b/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.mips64el-unknown-linux-muslabi64 b/docker/Dockerfile.mips64el-unknown-linux-muslabi64 index 56cf1c46f..79b1bfba8 100644 --- a/docker/Dockerfile.mips64el-unknown-linux-muslabi64 +++ b/docker/Dockerfile.mips64el-unknown-linux-muslabi64 @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.mipsel-unknown-linux-gnu b/docker/Dockerfile.mipsel-unknown-linux-gnu index 30e12758d..ae44a3930 100644 --- a/docker/Dockerfile.mipsel-unknown-linux-gnu +++ b/docker/Dockerfile.mipsel-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.mipsel-unknown-linux-musl b/docker/Dockerfile.mipsel-unknown-linux-musl index 6db436743..63247cd30 100644 --- a/docker/Dockerfile.mipsel-unknown-linux-musl +++ b/docker/Dockerfile.mipsel-unknown-linux-musl @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.native b/docker/Dockerfile.native index e32319e30..09feb6b91 100644 --- a/docker/Dockerfile.native +++ b/docker/Dockerfile.native @@ -8,9 +8,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build ARG TARGETARCH diff --git a/docker/Dockerfile.native.centos b/docker/Dockerfile.native.centos index 15c8dd468..a1958587a 100644 --- a/docker/Dockerfile.native.centos +++ b/docker/Dockerfile.native.centos @@ -23,9 +23,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - # these need to be present in **both** FROM sections ARG TARGETARCH ARG TARGETVARIANT diff --git a/docker/Dockerfile.powerpc-unknown-linux-gnu b/docker/Dockerfile.powerpc-unknown-linux-gnu index 0086fcdaa..38b0a90d8 100644 --- a/docker/Dockerfile.powerpc-unknown-linux-gnu +++ b/docker/Dockerfile.powerpc-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.powerpc64-unknown-linux-gnu b/docker/Dockerfile.powerpc64-unknown-linux-gnu index 9ecb2b970..a0f072207 100644 --- a/docker/Dockerfile.powerpc64-unknown-linux-gnu +++ b/docker/Dockerfile.powerpc64-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.powerpc64le-unknown-linux-gnu b/docker/Dockerfile.powerpc64le-unknown-linux-gnu index adb254ab2..4b6b9c092 100644 --- a/docker/Dockerfile.powerpc64le-unknown-linux-gnu +++ b/docker/Dockerfile.powerpc64le-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.riscv64gc-unknown-linux-gnu b/docker/Dockerfile.riscv64gc-unknown-linux-gnu index 002b84ae3..a10cdd5ee 100644 --- a/docker/Dockerfile.riscv64gc-unknown-linux-gnu +++ b/docker/Dockerfile.riscv64gc-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install -y --no-install-recommends \ diff --git a/docker/Dockerfile.riscv64gc-unknown-linux-musl b/docker/Dockerfile.riscv64gc-unknown-linux-musl index 99e295416..c90736922 100644 --- a/docker/Dockerfile.riscv64gc-unknown-linux-musl +++ b/docker/Dockerfile.riscv64gc-unknown-linux-musl @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install -y --no-install-recommends \ diff --git a/docker/Dockerfile.s390x-unknown-linux-gnu b/docker/Dockerfile.s390x-unknown-linux-gnu index 52917e80d..b64f0240d 100644 --- a/docker/Dockerfile.s390x-unknown-linux-gnu +++ b/docker/Dockerfile.s390x-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.sparc64-unknown-linux-gnu b/docker/Dockerfile.sparc64-unknown-linux-gnu index 9b6c2d730..d3686b4b5 100644 --- a/docker/Dockerfile.sparc64-unknown-linux-gnu +++ b/docker/Dockerfile.sparc64-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.sparcv9-sun-solaris b/docker/Dockerfile.sparcv9-sun-solaris index 23e490ff1..a8e4fd50f 100644 --- a/docker/Dockerfile.sparcv9-sun-solaris +++ b/docker/Dockerfile.sparcv9-sun-solaris @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY solaris.sh / diff --git a/docker/Dockerfile.thumbv6m-none-eabi b/docker/Dockerfile.thumbv6m-none-eabi index 089fe8e0c..bde147930 100644 --- a/docker/Dockerfile.thumbv6m-none-eabi +++ b/docker/Dockerfile.thumbv6m-none-eabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.thumbv7em-none-eabi b/docker/Dockerfile.thumbv7em-none-eabi index 244de742f..7fea780f2 100644 --- a/docker/Dockerfile.thumbv7em-none-eabi +++ b/docker/Dockerfile.thumbv7em-none-eabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.thumbv7em-none-eabihf b/docker/Dockerfile.thumbv7em-none-eabihf index 0e19328f2..44becf3f4 100644 --- a/docker/Dockerfile.thumbv7em-none-eabihf +++ b/docker/Dockerfile.thumbv7em-none-eabihf @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.thumbv7m-none-eabi b/docker/Dockerfile.thumbv7m-none-eabi index 88d0907b6..90d6bc3ab 100644 --- a/docker/Dockerfile.thumbv7m-none-eabi +++ b/docker/Dockerfile.thumbv7m-none-eabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.thumbv7neon-linux-androideabi b/docker/Dockerfile.thumbv7neon-linux-androideabi index e79eea9bd..c2f0fe815 100644 --- a/docker/Dockerfile.thumbv7neon-linux-androideabi +++ b/docker/Dockerfile.thumbv7neon-linux-androideabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY qemu.sh / diff --git a/docker/Dockerfile.thumbv7neon-unknown-linux-gnueabihf b/docker/Dockerfile.thumbv7neon-unknown-linux-gnueabihf index 3fd110ef6..1973b94ff 100644 --- a/docker/Dockerfile.thumbv7neon-unknown-linux-gnueabihf +++ b/docker/Dockerfile.thumbv7neon-unknown-linux-gnueabihf @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.thumbv8m.base-none-eabi b/docker/Dockerfile.thumbv8m.base-none-eabi index 500ddae4d..6928d7a2c 100644 --- a/docker/Dockerfile.thumbv8m.base-none-eabi +++ b/docker/Dockerfile.thumbv8m.base-none-eabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.thumbv8m.main-none-eabi b/docker/Dockerfile.thumbv8m.main-none-eabi index 851dca251..91bd3d510 100644 --- a/docker/Dockerfile.thumbv8m.main-none-eabi +++ b/docker/Dockerfile.thumbv8m.main-none-eabi @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.thumbv8m.main-none-eabihf b/docker/Dockerfile.thumbv8m.main-none-eabihf index 62891d9a2..8882b9009 100644 --- a/docker/Dockerfile.thumbv8m.main-none-eabihf +++ b/docker/Dockerfile.thumbv8m.main-none-eabihf @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.wasm32-unknown-emscripten b/docker/Dockerfile.wasm32-unknown-emscripten index 65b6f9095..93f68f5bc 100644 --- a/docker/Dockerfile.wasm32-unknown-emscripten +++ b/docker/Dockerfile.wasm32-unknown-emscripten @@ -8,9 +8,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ libxml2 \ python diff --git a/docker/Dockerfile.x86_64-linux-android b/docker/Dockerfile.x86_64-linux-android index 445f26b45..5d78c993c 100644 --- a/docker/Dockerfile.x86_64-linux-android +++ b/docker/Dockerfile.x86_64-linux-android @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build # Using qemu allows older host cpus (without sse4) to execute the target binaries diff --git a/docker/Dockerfile.x86_64-pc-solaris b/docker/Dockerfile.x86_64-pc-solaris index 475b8adbf..1af310287 100644 --- a/docker/Dockerfile.x86_64-pc-solaris +++ b/docker/Dockerfile.x86_64-pc-solaris @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY solaris.sh / diff --git a/docker/Dockerfile.x86_64-pc-windows-gnu b/docker/Dockerfile.x86_64-pc-windows-gnu index 86a752d58..0bea92329 100644 --- a/docker/Dockerfile.x86_64-pc-windows-gnu +++ b/docker/Dockerfile.x86_64-pc-windows-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN dpkg --add-architecture i386 && apt-get update && \ diff --git a/docker/Dockerfile.x86_64-unknown-dragonfly b/docker/Dockerfile.x86_64-unknown-dragonfly index a7195511f..b38585571 100644 --- a/docker/Dockerfile.x86_64-unknown-dragonfly +++ b/docker/Dockerfile.x86_64-unknown-dragonfly @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY dragonfly.sh / diff --git a/docker/Dockerfile.x86_64-unknown-freebsd b/docker/Dockerfile.x86_64-unknown-freebsd index 292f2dd6c..9629a4363 100644 --- a/docker/Dockerfile.x86_64-unknown-freebsd +++ b/docker/Dockerfile.x86_64-unknown-freebsd @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN echo "export ARCH=x86_64" > /freebsd-arch.sh diff --git a/docker/Dockerfile.x86_64-unknown-illumos b/docker/Dockerfile.x86_64-unknown-illumos index f2c3fa0eb..2dd5545f5 100644 --- a/docker/Dockerfile.x86_64-unknown-illumos +++ b/docker/Dockerfile.x86_64-unknown-illumos @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY illumos.sh / diff --git a/docker/Dockerfile.x86_64-unknown-linux-gnu b/docker/Dockerfile.x86_64-unknown-linux-gnu index 9c2f5404e..0f9503f8d 100644 --- a/docker/Dockerfile.x86_64-unknown-linux-gnu +++ b/docker/Dockerfile.x86_64-unknown-linux-gnu @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ diff --git a/docker/Dockerfile.x86_64-unknown-linux-musl b/docker/Dockerfile.x86_64-unknown-linux-musl index 226738b68..b25b39b07 100644 --- a/docker/Dockerfile.x86_64-unknown-linux-musl +++ b/docker/Dockerfile.x86_64-unknown-linux-musl @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY musl.sh / diff --git a/docker/Dockerfile.x86_64-unknown-netbsd b/docker/Dockerfile.x86_64-unknown-netbsd index ecae9e9e8..ca06a8161 100644 --- a/docker/Dockerfile.x86_64-unknown-netbsd +++ b/docker/Dockerfile.x86_64-unknown-netbsd @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build COPY netbsd.sh / diff --git a/docker/Dockerfile.zig b/docker/Dockerfile.zig index 75fc26d72..b7dbd3673 100644 --- a/docker/Dockerfile.zig +++ b/docker/Dockerfile.zig @@ -7,9 +7,6 @@ RUN /common.sh COPY cmake.sh / RUN /cmake.sh -COPY xargo.sh / -RUN /xargo.sh - FROM cross-base AS build ARG TARGETPLATFORM diff --git a/docker/xargo.sh b/docker/xargo.sh deleted file mode 100755 index 5f7e2dcd6..000000000 --- a/docker/xargo.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -set -x -set -euo pipefail - -# shellcheck disable=SC1091 -. lib.sh - -main() { - install_packages ca-certificates curl - - export RUSTUP_HOME=/tmp/rustup - export CARGO_HOME=/tmp/cargo - - curl --retry 3 -sSfL https://sh.rustup.rs -o rustup-init.sh - sh rustup-init.sh -y --no-modify-path --profile minimal - rm rustup-init.sh - - PATH="${CARGO_HOME}/bin:${PATH}" cargo install xargo --root /usr/local - - rm -r "${RUSTUP_HOME}" "${CARGO_HOME}" - - purge_packages - - rm "${0}" -} - -main "${@}"