From f6d43f3bd8f9e4274adde69084b8074c519e4a1f Mon Sep 17 00:00:00 2001
From: Simon Schwitanski <schwitanski@itc.rwth-aachen.de>
Date: Tue, 19 Mar 2024 22:29:08 +0100
Subject: [PATCH] Add missing compiler-rt and build checks
---
Dockerfile | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 98e6874..2638c7b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,10 @@ RUN apt-get update \
libgtest-dev \
clang-${LLVM_VERSION} \
libomp-${LLVM_VERSION}-dev \
+ libclang-${LLVM_VERSION}-dev \
+ libclang-rt-${LLVM_VERSION}-dev \
clang-format-${LLVM_VERSION} \
+ clang-tidy-${LLVM_VERSION} \
llvm-${LLVM_VERSION} \
lldb-${LLVM_VERSION} \
ninja-build \
@@ -55,6 +58,11 @@ RUN ln -s /usr/bin/clang-${LLVM_VERSION} /usr/bin/clang
RUN ln -s /usr/bin/clang++-${LLVM_VERSION} /usr/bin/clang++
RUN ln -s /usr/bin/clang-format-${LLVM_VERSION} /usr/bin/clang-format
+# Install lit
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+RUN pip3 install --no-input --no-cache-dir --disable-pip-version-check lit==14.0.0
ENV CC=clang
ENV CXX=clang++
@@ -92,12 +100,13 @@ RUN wget https://hpc.rwth-aachen.de/must/files/MUST-v${MUST_VERSION}.tar.gz && \
mkdir build && \
cd build && \
CC=clang CXX=clang++ MPICH_CC=clang MPICH_CXX=clang++ OMPI_CC=clang OMPI_CXX=clang \
- cmake .. -DCMAKE_INSTALL_PREFIX=/opt/must -DUSE_BACKWARD=ON -DENABLE_FORTRAN=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo && \
+ cmake .. -DCMAKE_INSTALL_PREFIX=/opt/must -DUSE_BACKWARD=ON -DENABLE_TESTS=ON -DENABLE_FORTRAN=ON -DLLVM_FILECHECK_PATH=$(which FileCheck) -DCMAKE_BUILD_TYPE=Release && \
make install -j8 install-prebuilds && \
+ make check-basic -j8 && \
rm /MUST-v${MUST_VERSION}.tar.gz && \
rm -r -f /MUST-v${MUST_VERSION}
-
# Run as non-privileged user
RUN useradd -ms /bin/bash user
-USER user
\ No newline at end of file
+USER user
+WORKDIR /home/user
\ No newline at end of file
--
GitLab