diff --git a/ubuntu b/ubuntu index eb0c734..53203db 100644 --- a/ubuntu +++ b/ubuntu @@ -7,13 +7,19 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y \ - ccache clang clang-format clang-tidy cmake curl flang g++ gfortran git gnupg2 libgtest-dev libhwloc-dev libomp-dev llvm make ninja-build sudo vim wget zstd && \ + ccache clang clang-format clang-tidy cmake curl g++ gfortran git gnupg2 libgtest-dev libhwloc-dev libomp-dev llvm make ninja-build sudo vim wget zstd && \ if [ "$(uname -m)" = "x86_64" ]; then \ apt-get install -y gcc-multilib g++-multilib gfortran-multilib; \ fi && \ apt-get purge --autoremove -y && \ rm -rf /var/lib/apt/lists/* +RUN . /etc/os-release && if [ "${VERSION_ID}" != "22.04" ]; then \ + apt-get install -y flang && \ + apt-get purge --autoremove -y && \ + apt-get clean; \ +fi + RUN if [ "${INTEL}" = "yes" ]; then \ wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \ echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list && \