From b07fcca329fae84821414baa979fd5de53c1d37e Mon Sep 17 00:00:00 2001 From: Martin Nowack Date: Wed, 7 Jun 2023 17:14:23 +0100 Subject: Use recommended LLVM 13 as part of the Docker image --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d58fd245..d345ff5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM ghcr.io/klee/llvm:110_O_D_A_ubuntu_jammy-20230126 as llvm_base +FROM ghcr.io/klee/llvm:130_O_D_A_ubuntu_jammy-20230126 as llvm_base FROM ghcr.io/klee/gtest:1.11.0_ubuntu_jammy-20230126 as gtest_base -FROM ghcr.io/klee/uclibc:klee_uclibc_v1.3_110_ubuntu_jammy-20230126 as uclibc_base +FROM ghcr.io/klee/uclibc:klee_uclibc_v1.3_130_ubuntu_jammy-20230126 as uclibc_base FROM ghcr.io/klee/tcmalloc:2.9.1_ubuntu_jammy-20230126 as tcmalloc_base FROM ghcr.io/klee/stp:2.3.3_ubuntu_jammy-20230126 as stp_base FROM ghcr.io/klee/z3:4.8.15_ubuntu_jammy-20230126 as z3_base -FROM ghcr.io/klee/libcxx:110_ubuntu_jammy-20230126 as libcxx_base +FROM ghcr.io/klee/libcxx:130_ubuntu_jammy-20230126 as libcxx_base FROM ghcr.io/klee/sqlite:3400100_ubuntu_jammy-20230126 as sqlite3_base FROM llvm_base as intermediate COPY --from=gtest_base /tmp /tmp/ @@ -17,7 +17,7 @@ COPY --from=sqlite3_base /tmp /tmp/ ENV COVERAGE=0 ENV USE_TCMALLOC=1 ENV BASE=/tmp -ENV LLVM_VERSION=11.0 +ENV LLVM_VERSION=13.0 ENV ENABLE_DOXYGEN=1 ENV ENABLE_OPTIMIZED=1 ENV ENABLE_DEBUG=1 @@ -56,7 +56,7 @@ RUN /tmp/klee_src/scripts/build/build.sh --debug --install-system-deps klee && p sudo rm -rf /var/lib/apt/lists/* -ENV PATH="$PATH:/tmp/llvm-110-install_O_D_A/bin:/home/klee/klee_build/bin:/home/klee/.local/bin" +ENV PATH="$PATH:/tmp/llvm-130-install_O_D_A/bin:/home/klee/klee_build/bin:/home/klee/.local/bin" ENV BASE=/tmp # Add path to local LLVM installation - let system install precede local install RUN /bin/bash -c 'echo "export \"PATH=$PATH:$(cd ${BASE}/llvm-*-install*/bin/ && pwd)\" >> /home/klee/.bashrc"' -- cgit 1.4.1