File tree 27 files changed +36
-27
lines changed
aarch64-unknown-linux-gnu
aarch64-unknown-linux-musl
arm-unknown-linux-gnueabihf
arm-unknown-linux-musleabihf
mips64-unknown-linux-gnuabi64
mips64el-unknown-linux-gnuabi64
mipsel-unknown-linux-musl
powerpc-unknown-linux-gnu
powerpc64-unknown-linux-gnu
powerpc64le-unknown-linux-gnu
sparc64-unknown-linux-gnu
wasm32-unknown-emscripten
x86_64-unknown-linux-gnux32
x86_64-unknown-linux-musl
27 files changed +36
-27
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,8 @@ RUN mv /root/.android /tmp
27
27
RUN chmod 777 -R /tmp/.android
28
28
RUN chmod 755 /android/sdk/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
29
29
30
- ENV PATH=$PATH:/rust/bin \
30
+ ENV PATH=$PATH \
31
+ RUSTUP_HOME=/.rustup \
31
32
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
32
33
CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=/tmp/runtest \
33
34
HOME=/tmp
Original file line number Diff line number Diff line change @@ -4,4 +4,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
4
4
gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user
5
5
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
6
6
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64 -L /usr/aarch64-linux-gnu" \
7
- PATH=$PATH:/rust/bin
7
+ RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -20,7 +20,8 @@ RUN curl --retry 5 -L https://github.com/sabotage-linux/kernel-headers/archive/v
20
20
rm -rf kernel-headers-3.12.6-6
21
21
22
22
# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in libstd?
23
- ENV PATH=$PATH:/musl-aarch64/bin:/rust/bin \
23
+ ENV PATH=$PATH:/musl-aarch64/bin \
24
+ RUSTUP_HOME=/.rustup \
24
25
CC_aarch64_unknown_linux_musl=musl-gcc \
25
26
RUSTFLAGS='-Clink-args=-lgcc' \
26
27
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc \
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ RUN mv /root/.android /tmp
27
27
RUN chmod 777 -R /tmp/.android
28
28
RUN chmod 755 /android/sdk/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
29
29
30
- ENV PATH=$PATH:/rust/bin \
30
+ ENV RUSTUP_HOME=/.rustup \
31
31
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
32
32
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=/tmp/runtest \
33
33
HOME=/tmp
Original file line number Diff line number Diff line change @@ -4,4 +4,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
4
4
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user
5
5
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
6
6
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" \
7
- PATH=$PATH:/rust/bin
7
+ RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -19,7 +19,8 @@ RUN curl --retry 5 -L https://github.com/sabotage-linux/kernel-headers/archive/v
19
19
cd .. && \
20
20
rm -rf kernel-headers-3.12.6-6
21
21
22
- ENV PATH=$PATH:/musl-arm/bin:/rust/bin \
22
+ ENV PATH=$PATH:/musl-arm/bin \
23
+ RUSTUP_HOME=/.rustup \
23
24
CC_arm_unknown_linux_musleabihf=musl-gcc \
24
25
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=musl-gcc \
25
26
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_RUNNER="qemu-arm -L /musl-arm"
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ RUN apt-get update && \
13
13
COPY emscripten.sh /
14
14
RUN bash /emscripten.sh
15
15
16
- ENV PATH=$PATH:/rust/bin \
16
+ ENV RUSTUP_HOME=/.rustup \
17
17
CARGO_TARGET_ASMJS_UNKNOWN_EMSCRIPTEN_RUNNER=node
18
18
19
19
COPY emscripten-entry.sh /
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ RUN mv /root/.android /tmp
27
27
RUN chmod 777 -R /tmp/.android
28
28
RUN chmod 755 /android/sdk/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
29
29
30
- ENV PATH=$PATH:/rust/bin \
30
+ ENV RUSTUP_HOME=/.rustup \
31
31
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
32
32
CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=/tmp/runtest \
33
33
HOME=/tmp
Original file line number Diff line number Diff line change @@ -2,4 +2,4 @@ FROM ubuntu:18.04
2
2
RUN apt-get update
3
3
RUN apt-get install -y --no-install-recommends \
4
4
gcc-multilib libc6-dev ca-certificates
5
- ENV PATH=$PATH:/rust/bin
5
+ ENV RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -27,5 +27,6 @@ RUN curl --retry 5 -L https://github.com/sabotage-linux/kernel-headers/archive/v
27
27
cd .. && \
28
28
rm -rf kernel-headers-3.12.6-6
29
29
30
- ENV PATH=$PATH:/musl-i686/bin:/rust/bin \
30
+ ENV PATH=$PATH:/musl-i686/bin \
31
+ RUSTUP_HOME=/.rustup
31
32
CC_i686_unknown_linux_musl=musl-gcc
Original file line number Diff line number Diff line change @@ -7,4 +7,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
7
7
8
8
ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc \
9
9
CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_RUNNER="qemu-mips -L /usr/mips-linux-gnu" \
10
- PATH=$PATH:/rust/bin
10
+ RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -11,7 +11,8 @@ RUN mkdir /toolchain
11
11
RUN curl --retry 5 -L https://s3-us-west-1.amazonaws.com/rust-lang-ci2/libc/OpenWrt-SDK-ar71xx-generic_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 | \
12
12
tar xjf - -C /toolchain --strip-components=1
13
13
14
- ENV PATH=$PATH:/rust/bin:/toolchain/staging_dir/toolchain-mips_34kc_gcc-5.3.0_musl-1.1.15/bin \
14
+ ENV PATH=$PATH:/toolchain/staging_dir/toolchain-mips_34kc_gcc-5.3.0_musl-1.1.15/bin \
15
+ RUSTUP_HOME=/.rustup \
15
16
CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \
16
17
CARGO_TARGET_MIPS_UNKNOWN_LINUX_MUSL_LINKER=mips-openwrt-linux-gcc \
17
18
CARGO_TARGET_MIPS_UNKNOWN_LINUX_MUSL_RUNNER="qemu-mips -L /toolchain/staging_dir/toolchain-mips_34kc_gcc-5.3.0_musl-1.1.15"
Original file line number Diff line number Diff line change @@ -8,4 +8,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
8
8
ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
9
9
CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_RUNNER="qemu-mips64 -L /usr/mips64-linux-gnuabi64" \
10
10
CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \
11
- PATH=$PATH:/rust/bin
11
+ RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -8,4 +8,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
8
8
ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc \
9
9
CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_RUNNER="qemu-mips64el -L /usr/mips64el-linux-gnuabi64" \
10
10
CC_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-gcc \
11
- PATH=$PATH:/rust/bin
11
+ RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -11,7 +11,8 @@ RUN mkdir /toolchain
11
11
RUN curl --retry 5 -L https://s3-us-west-1.amazonaws.com/rust-lang-ci2/libc/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 | \
12
12
tar xjf - -C /toolchain --strip-components=2
13
13
14
- ENV PATH=$PATH:/rust/bin:/toolchain/bin \
14
+ ENV PATH=$PATH:/toolchain/bin \
15
+ RUSTUP_HOME=/.rustup \
15
16
CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
16
17
CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_LINKER=mipsel-openwrt-linux-gcc \
17
18
CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_RUNNER="qemu-mipsel -L /toolchain"
Original file line number Diff line number Diff line change @@ -7,4 +7,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
7
7
8
8
ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
9
9
CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc -L /usr/powerpc-linux-gnu" \
10
- PATH=$PATH:/rust/bin
10
+ RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -8,4 +8,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
8
8
ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \
9
9
CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64 -L /usr/powerpc64-linux-gnu" \
10
10
CC=powerpc64-linux-gnu-gcc \
11
- PATH=$PATH:/rust/bin
11
+ RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -8,4 +8,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
8
8
ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
9
9
CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64le -L /usr/powerpc64le-linux-gnu" \
10
10
CC=powerpc64le-linux-gnu-gcc \
11
- PATH=$PATH:/rust/bin
11
+ RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -15,4 +15,4 @@ COPY test-runner-linux /
15
15
ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
16
16
CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="/test-runner-linux s390x" \
17
17
CC_s390x_unknown_linux_gnu=s390x-linux-gnu-gcc \
18
- PATH=$PATH:/rust/bin
18
+ RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -18,4 +18,4 @@ COPY test-runner-linux /
18
18
ENV CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_LINKER=sparc64-linux-gnu-gcc \
19
19
CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_RUNNER="/test-runner-linux sparc64" \
20
20
CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
21
- PATH=$PATH:/rust/bin
21
+ RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ RUN apt-get update && \
13
13
COPY emscripten.sh /
14
14
RUN bash /emscripten.sh
15
15
16
- ENV PATH=$PATH:/rust/bin \
16
+ ENV RUSTUP_HOME=/.rustup \
17
17
CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_RUNNER=node-wrapper.sh
18
18
19
19
COPY emscripten-entry.sh /
Original file line number Diff line number Diff line change @@ -19,7 +19,8 @@ RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
19
19
COPY android-sysimage.sh /android/
20
20
RUN bash /android/android-sysimage.sh x86_64 x86_64-24_r07.zip
21
21
22
- ENV PATH=$PATH:/rust/bin:/android/ndk-$ANDROID_ARCH/bin \
22
+ ENV PATH=$PATH:/android/ndk-$ANDROID_ARCH/bin \
23
+ RUSTUP_HOME=/.rustup \
23
24
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \
24
25
CC_x86_64_linux_android=x86_64-linux-android-gcc \
25
26
CXX_x86_64_linux_android=x86_64-linux-android-g++ \
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ USER root
3
3
RUN apt-get update
4
4
RUN apt-get install -y --no-install-recommends \
5
5
qemu
6
- ENV PATH=$PATH:/rust/bin \
6
+ ENV RUSTUP_HOME=/.rustup \
7
7
CARGO_TARGET_X86_64_RUMPRUN_NETBSD_RUNNER=/tmp/runtest
8
8
9
9
ADD docker/x86_64-rumprun-netbsd/runtest.rs /tmp/
Original file line number Diff line number Diff line change @@ -2,4 +2,4 @@ FROM ubuntu:18.04
2
2
RUN apt-get update
3
3
RUN apt-get install -y --no-install-recommends \
4
4
gcc libc6-dev ca-certificates
5
- ENV PATH=$PATH:/rust/bin
5
+ ENV RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -2,4 +2,4 @@ FROM ubuntu:18.04
2
2
RUN apt-get update
3
3
RUN apt-get install -y --no-install-recommends \
4
4
gcc-multilib libc6-dev ca-certificates
5
- ENV PATH=$PATH:/rust/bin
5
+ ENV RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -17,4 +17,5 @@ RUN curl --retry 5 -L https://github.com/sabotage-linux/kernel-headers/archive/v
17
17
make ARCH=x86_64 prefix=/musl-x86_64 install -j4 && \
18
18
cd .. && \
19
19
rm -rf kernel-headers-3.12.6-6
20
- ENV PATH=$PATH:/musl-x86_64/bin:/rust/bin
20
+ ENV PATH=$PATH:/musl-x86_64/bin \
21
+ RUSTUP_HOME=/.rustup
Original file line number Diff line number Diff line change @@ -24,7 +24,8 @@ run() {
24
24
--volume " ${HOME} /.cargo" :/cargo \
25
25
$kvm \
26
26
--env CARGO_HOME=/cargo \
27
- --volume " ${HOME} " /.rustup:/rust:ro \
27
+ --volume " $( rustc --print sysroot) " :/rust:ro \
28
+ --volume " ${HOME} " /.rustup:/.rustup:ro \
28
29
--volume " $( pwd) " :/checkout:ro \
29
30
--volume " $( pwd) " /target:/checkout/target \
30
31
--env CARGO_TARGET_DIR=/checkout/target \
You can’t perform that action at this time.
0 commit comments