From a7a054a5d86d7b7815c6f1946e583023dc315c12 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 3 Jan 2020 12:20:55 -0500 Subject: [PATCH] Updated clang --- Dockerfile | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 22f9242..99bc8e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,24 @@ FROM ubuntu:bionic -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + +RUN apt-get update && \ +DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg wget + +RUN \ +echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" >> /etc/apt/sources.list && \ +wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key > llvm_key && apt-key add llvm_key + +RUN \ +apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + libllvm-9-ocaml-dev libllvm9 llvm-9 llvm-9-dev llvm-9-doc llvm-9-examples llvm-9-runtime \ + clang-9 clang-tools-9 clang-9-doc libclang-common-9-dev libclang-9-dev libclang1-9 clang-format-9 python-clang-9 clangd-9 \ + libfuzzer-9-dev \ + lldb-9 \ + lld-9 \ + libc++-9-dev libc++abi-9-dev \ autoconf \ automake \ bsdmainutils \ - ccache \ - clang-format \ - clang \ cmake \ curl \ libunwind8 \ @@ -22,13 +34,11 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ htop \ iputils-ping \ libc6-dbg \ - libclang-dev \ liblttng-ust-dev \ libncurses5-dev \ libreadline-dev \ libtool \ libz-dev \ - llvm \ locales \ lttng-modules-dkms \ lttng-tools \ @@ -73,6 +83,16 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ && rm -rf /var/lig/apt/lists/* +run \ +update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 100; \ +update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 100; \ +update-alternatives --config clang; \ +update-alternatives --config clang++ + +# this is done here so that ccache sees clang++ installed, not clang-9 +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y ccache + + run pip install pybars3 paramiko mkdocs run npm install -g npx