diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2019-11-28 09:29:30 +0100 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2019-12-02 13:27:07 +0000 |
| commit | 7606963ffd637aa4a410f931621af3bb982899b7 (patch) | |
| tree | 863e4a169b0f6b54d3156cd8408bec55c56f3455 /docker | |
| parent | 50fc76130ef6089ef6805076a4301a1d4925934c (diff) | |
Update Dockerfile for Ubuntu/bionic to install clang-8
Requied to be able to run clang-tidy
Change-Id: Ie0b6eb3229e8a93ea2e7dd10d75824fb40702fa6
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/bionic/Dockerfile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile index 3336c8599..178186c67 100644 --- a/docker/bionic/Dockerfile +++ b/docker/bionic/Dockerfile @@ -124,7 +124,9 @@ RUN apt-get update -qq && \ ccache \ curl \ git \ - libclang-3.9 \ + libclang-3.9-dev \ + clang-8 \ + clang-tidy-8 \ libdbus-1-3 \ libfreetype6 \ libfontconfig1 \ @@ -134,9 +136,11 @@ RUN apt-get update -qq && \ help2man \ python-pip \ p7zip-full && \ + update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100 && \ + update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 100 && \ pip install beautifulsoup4 lxml # for building the documentation -ENV LLVM_INSTALL_DIR=/usr/lib/llvm-3.9 +ENV LLVM_INSTALL_DIR=/usr/lib/llvm-8 # @@ -169,8 +173,11 @@ RUN apt-get install -qq -y --no-install-recommends \ # Configure Qbs USER $USER_NAME RUN qbs-setup-toolchains /usr/bin/g++ gcc && \ + qbs-setup-toolchains /usr/bin/clang clang && \ qbs-setup-qt /opt/Qt/${QT_VERSION}/gcc_64/bin/qmake qt-gcc_64 && \ qbs config profiles.qt-gcc_64.baseProfile gcc && \ + qbs-setup-qt /opt/Qt/${QT_VERSION}/gcc_64/bin/qmake qt-clang_64 && \ + qbs config profiles.qt-clang_64.baseProfile clang && \ qbs config defaultProfile qt-gcc_64 && \ \ qbs-setup-toolchains /usr/bin/x86_64-w64-mingw32-g++ mingw && \ |