diff options
| author | Josh Stone <jistone@redhat.com> | 2023-07-20 17:15:02 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2023-07-21 12:22:25 -0700 |
| commit | ecb84f65ea07c2b2b922034b18c998cf3591d1db (patch) | |
| tree | e46932d5981aa2777e413fd7dd75d82531b0d36c /src/ci | |
| parent | a82fa0d1c719a3ec42aaa76d0a5aba3703014322 (diff) | |
| download | rust-ecb84f65ea07c2b2b922034b18c998cf3591d1db.tar.gz rust-ecb84f65ea07c2b2b922034b18c998cf3591d1db.zip | |
ci: Update dist-x86_64-netbsd to ubuntu:22.04
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-netbsd/Dockerfile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-netbsd/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-netbsd/Dockerfile index 041bacf3397..effdc99d9a6 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-netbsd/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-netbsd/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 +ARG DEBIAN_FRONTEND=noninteractive COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y zlib1g-dev +RUN apt-get install -y zlib1g-dev COPY host-x86_64/dist-x86_64-netbsd/build-netbsd-toolchain.sh /tmp/ -RUN /tmp/build-netbsd-toolchain.sh - -COPY scripts/cmake.sh /scripts/ -RUN /scripts/cmake.sh +# GCC 10 changed the default to -fno-common, which causes errors with the NetBSD-9.0 sources like: +# /usr/bin/ld: buf.o:(.bss+0x0): multiple definition of `debug_file'; arch.o:(.bss+0x0): first defined here +RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh |