From 7c71d3740405d97dab831a5aa4660f3c0234148a Mon Sep 17 00:00:00 2001 From: Patrick Kappl Date: Wed, 11 Dec 2024 17:29:09 +0100 Subject: [PATCH] Ensure that GCC and gcov have the same version Also raise the priority of all `update-alternative --install` calls to 99 to ensure that we will really use the our specified version. --- linux-x86/Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/linux-x86/Dockerfile b/linux-x86/Dockerfile index 2c2bbc9..0508349 100644 --- a/linux-x86/Dockerfile +++ b/linux-x86/Dockerfile @@ -30,11 +30,12 @@ RUN dpkg --add-architecture i386 && apt-get update -qq && apt-get install -y -qq && rm -rf /var/lib/apt/lists/* # Setup tools versions -RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 15 -RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 15 -RUN update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-15 15 -RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 +RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 99 +RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 99 +RUN update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-15 99 +RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 99 +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 99 +RUN update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-12 99 # Install CMake 3.22 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-linux-x86_64.tar.gz -q