Skip to content

Commit

Permalink
Ensure that GCC and gcov have the same version
Browse files Browse the repository at this point in the history
Also raise the priority of all `update-alternative --install` calls to
99 to ensure that we will really use the our specified version.
  • Loading branch information
PatrickKa committed Dec 11, 2024
1 parent 264bb01 commit 7c71d37
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions linux-x86/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7c71d37

Please sign in to comment.