Skip to content

Commit 584492b

Browse files
committed
wip
1 parent 405afb2 commit 584492b

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

ci/azure.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pr: ["master"]
1212
jobs:
1313
- job: DockerLinuxTier1
1414
pool:
15-
vmImage: ubuntu-16.04
15+
vmImage: ubuntu-18.04
1616
steps:
1717
- template: azure-install-rust.yml
1818
- bash: LIBC_CI=1 sh ./ci/run-docker.sh $TARGET
@@ -27,7 +27,7 @@ jobs:
2727
- job: DockerLinuxTier2
2828
#dependsOn: DockerLinuxTier1
2929
pool:
30-
vmImage: ubuntu-16.04
30+
vmImage: ubuntu-18.04
3131
steps:
3232
- template: azure-install-rust.yml
3333
- bash: LIBC_CI=1 sh ./ci/run-docker.sh $TARGET
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM ubuntu:19.10
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc libc6-dev ca-certificates \
4-
gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user
4+
gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user linux-headers-generic
5+
RUN ls -a /usr/include/; ls -a /usr/aarch64-linux-gnu/include/
56
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
67
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64 -L /usr/aarch64-linux-gnu" \
8+
CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
79
PATH=$PATH:/rust/bin

ci/docker/mips-unknown-linux-gnu/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM ubuntu:19.10
1+
# FIXME: Ubuntu 19.10 is missing gcc-mips-linux-gnu.
2+
FROM ubuntu:19.04
23

34
RUN apt-get update && apt-get install -y --no-install-recommends \
45
gcc libc6-dev qemu-user ca-certificates \

ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ FROM ubuntu:19.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
5-
gcc-mips64el-linux-gnuabi64 libc6-dev-mips64el-cross \
5+
gcc-mips64-linux-gnuabi64 libc6-dev-mips64el-cross \
66
qemu-system-mips64el linux-headers-generic
77

8-
ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc \
8+
ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
99
CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_RUNNER="qemu-mips64el -L /usr/mips64el-linux-gnuabi64" \
10-
CC_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-gcc \
10+
CC_mips64el_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \
1111
PATH=$PATH:/rust/bin

0 commit comments

Comments
 (0)