diff --git a/.docker/Dockerfile-ubuntu-20.04-base b/.docker/Dockerfile-ubuntu-20.04-base index d193850f0..b8392dc7f 100644 --- a/.docker/Dockerfile-ubuntu-20.04-base +++ b/.docker/Dockerfile-ubuntu-20.04-base @@ -5,6 +5,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && apt-get -y install --no-install-recommends \ cmake \ + clang-12 \ virtualenv \ rapidjson-dev \ libfuse2 \ diff --git a/.docker/Dockerfile-ubuntu-20.04-build b/.docker/Dockerfile-ubuntu-20.04-build index 4e566bb0d..9f5c8a520 100644 --- a/.docker/Dockerfile-ubuntu-20.04-build +++ b/.docker/Dockerfile-ubuntu-20.04-build @@ -7,6 +7,10 @@ RUN mkdir /src/build # cmake RUN cd /src/build && \ CXXFLAGS=-fno-sized-deallocation cmake \ + -DUSE_PRECOMPILED_HEADERS=Off \ + -DUSE_SUBMODULE_BOOST=Off \ + -DCMAKE_C_COMPILER=clang-12 \ + -DCMAKE_CXX_COMPILER=clang++-12 \ -DCMAKE_INSTALL_PREFIX=appdir/usr/ \ -DCMAKE_PREFIX_PATH=/opt/qt512/lib/cmake \ -DBUILD_WITH_QTKEYCHAIN=OFF \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f7de9e8e..1a3d4f1a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -304,12 +304,13 @@ jobs: run: | sudo apt-get update sudo apt-get -y install \ - gcc-10 \ - g++-10 + clang-12 + sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 60 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 60 # Prioritize GCC/G++ 10 over default-installed GCC/G++ 9 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 60 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 + sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang 60 + sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 60 - name: Apply Qt patches (Ubuntu) if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.qt-version, '5.') @@ -327,7 +328,6 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \ -DUSE_PRECOMPILED_HEADERS=OFF \ - -DUSE_SUBMODULE_BOOST=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS=On \ -DCHATTERINO_LTO="$C2_ENABLE_LTO" \ -DCHATTERINO_PLUGINS="$C2_PLUGINS" \