From 6b292e570ac54e0f16f47582fc742972c1086dc1 Mon Sep 17 00:00:00 2001 From: John Demme Date: Tue, 13 Feb 2024 21:40:53 +0000 Subject: [PATCH] [Integration test] Install gcc-11 to support slang builds --- integration_test/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/integration_test/Dockerfile b/integration_test/Dockerfile index 8654a2c..3332d51 100644 --- a/integration_test/Dockerfile +++ b/integration_test/Dockerfile @@ -35,8 +35,9 @@ RUN ln -s /usr/bin/clang-16 /usr/bin/clang;\ ln -s /usr/bin/lld-16 /usr/bin/lld;\ ln -s /usr/bin/lld-16 /usr/bin/ld.lld -# Install GCC 10 to get C++20 header support -RUN apt install -y g++-10 +# Install GCC 11 to get C++20 header support and support for building slang +RUN add-apt-repository ppa:ubuntu-toolchain-r/test +RUN apt install -y g++-11 COPY *.sh /tmp/ @@ -56,8 +57,8 @@ RUN /tmp/or-tools.sh RUN rm -r /tmp/or-tools-* # Compile, install, then cleanup iverilog -run /tmp/iverilog.sh -run rm -r /tmp/iverilog-* +RUN /tmp/iverilog.sh +RUN rm -r /tmp/iverilog-* # Install a modern release of Z3 RUN /tmp/z3.sh