From 084e9212dc11dbe896a205deea4f4b359e86a341 Mon Sep 17 00:00:00 2001 From: Volkan Date: Wed, 12 Jun 2024 11:51:59 +0200 Subject: [PATCH] Add llvm-lit as a dependency (#16) --- linux/Dockerfile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/linux/Dockerfile b/linux/Dockerfile index 0a238b3..7ade0b1 100755 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -17,21 +17,21 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update \ && apt-get upgrade -y \ - && apt-get install \ + && apt-get install -y \ apt-utils \ git \ wget gnupg curl \ build-essential \ libz-dev \ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \ - -y + python3-venv + # dpkg --add-architecture arm64 \ # # Setup llvm sources # RUN echo "deb http://apt.llvm.org/$LLVM_DEBIAN_VERSION/ llvm-toolchain-$LLVM_DEBIAN_VERSION-$LLVM_VER main" >> /etc/apt/sources.list.d/llvm.list # RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - -# RUN apt-get update #Install Clang dependencies #On bookworm clang is version 14, which is what we have as default. #Installing without versions here is convinient for scripts calling clang or lld instead of clang-14/lld-14 @@ -40,6 +40,14 @@ RUN apt-get install -y zip clang lldb lld clangd \ clangd-$LLVM_VER liblld-$LLVM_VER-dev \ llvm-$LLVM_VER-dev libpolly-$LLVM_VER-dev +# Install llvm-lit, which we use for correctness tests +RUN python3 -m venv /opt/venv \ + && /opt/venv/bin/python -m pip install --upgrade pip \ + && /opt/venv/bin/python -m pip install pipx \ + && /opt/venv/bin/pipx install lit \ + && /opt/venv/bin/pipx ensurepath \ + && /opt/venv/bin/pipx ensurepath --global + ENV CARGO_HOME=/usr/local/cargo ENV RUSTUP_HOME=/usr/local/rustup # Get Rust