diff options
author | van Hauser <vh@thc.org> | 2022-01-30 20:55:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-30 20:55:55 +0100 |
commit | 267dd634f141b2968cafef620d75c10681fb5ab9 (patch) | |
tree | 9e96e0ebbac070c777f3d931680bc0d47bcb212c /Dockerfile | |
parent | 59a7337bf14b53ba970b6362d911c196f22e3b5e (diff) | |
parent | 7ab7862e4db75024cae98aecdc79d9247db355e7 (diff) | |
download | afl++-267dd634f141b2968cafef620d75c10681fb5ab9.tar.gz |
Merge pull request #1318 from moyix/stable
Build docker images for arm64 as well as x86.
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index a3c70746..53189657 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,13 +39,20 @@ RUN echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main RUN apt-get update && apt-get full-upgrade -y && \ apt-get -y install --no-install-suggests --no-install-recommends \ - gcc-10 g++-10 gcc-10-plugin-dev gcc-10-multilib gcc-multilib gdb lcov \ + gcc-10 g++-10 gcc-10-plugin-dev gdb lcov \ clang-12 clang-tools-12 libc++1-12 libc++-12-dev \ libc++abi1-12 libc++abi-12-dev libclang1-12 libclang-12-dev \ libclang-common-12-dev libclang-cpp12 libclang-cpp12-dev liblld-12 \ liblld-12-dev liblldb-12 liblldb-12-dev libllvm12 libomp-12-dev \ - libomp5-12 lld-12 lldb-12 llvm-12 llvm-12-dev llvm-12-runtime llvm-12-tools \ - && rm -rf /var/lib/apt/lists/* + libomp5-12 lld-12 lldb-12 llvm-12 llvm-12-dev llvm-12-runtime llvm-12-tools + +# arm64 doesn't have gcc-multilib, and it's only used for -m32 support on x86 +ARG TARGETPLATFORM +RUN [ "$TARGETPLATFORM" = "linux/amd64" ] && \ + apt-get -y install --no-install-suggests --no-install-recommends \ + gcc-10-multilib gcc-multilib || true + +RUN rm -rf /var/lib/apt/lists/* RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 0 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 0 |