Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update GCC toolchain to version 14.2 #672

Merged
merged 2 commits into from
Jan 7, 2025
Merged

feat: update GCC toolchain to version 14.2 #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
157db69
feat: update GCC toolchain to version 14.2
rjaegers Dec 16, 2024
a1fdb30
test: disable C++ module support to fix ccache test
rjaegers Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .devcontainer/cpp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ENV PATH="$PATH:/usr/lib/llvm-${CLANG_VERSION}/bin"

# Install arm-gcc toolchain
RUN mkdir /opt/gcc-arm-none-eabi \
&& wget -qO - "https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-$(uname -m)-arm-none-eabi.tar.xz" | tar --exclude='*arm-none-eabi-gdb*' --exclude='share' --strip-components=1 -xJC /opt/gcc-arm-none-eabi
&& wget -qO - "https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-$(uname -m)-arm-none-eabi.tar.xz" | tar --exclude='*arm-none-eabi-gdb*' --exclude='share' --strip-components=1 -xJC /opt/gcc-arm-none-eabi
ENV PATH="$PATH:/opt/gcc-arm-none-eabi/bin"

# Install docker-cli for Docker-from-Docker tools
Expand Down Expand Up @@ -97,9 +97,9 @@ RUN --mount=type=cache,target=/root/.ccache,sharing=locked \

# Update all tool alternatives to the correct version
# and patch root's bashrc to include bash-completion
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-13 20 \
&& update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-13 20 \
&& update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-13 10 \
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-14 20 \
&& update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-14 20 \
&& update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-14 10 \
&& update-alternatives --install /usr/bin/iwyu iwyu /usr/local/bin/include-what-you-use 10 \
&& update-alternatives --install /usr/bin/mull-runner mull-runner /usr/local/bin/mull-runner-${CLANG_VERSION} 10 \
&& update-alternatives --install /usr/lib/mull-ir-frontend mull-ir-frontend /usr/local/lib/mull-ir-frontend-${CLANG_VERSION} 10 \
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/cpp/apt-requirements-base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"bash-completion": "1:2.11-8",
"ca-certificates": "20240203",
"g++-13": "13.3.0-6ubuntu2~24.04",
"g++-14": "14.2.0-4ubuntu2~24.04",
"gdb-multiarch": "15.0.50.20240403-0ubuntu1",
"git": "1:2.43.0-1ubuntu7.1",
"gnupg2": "2.4.4-2ubuntu17",
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/rust/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN batstmp="$(mktemp -d /tmp/bats-core-${BATS_VERSION}.XXXX)" \

# Update all tool alternatives to the correct version
# and patch root's bashrc to include bash-completion
RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-13 20 \
RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-14 20 \
&& cp /etc/skel/.bashrc /root/.bashrc

ENV BINSTALL_DISABLE_TELEMETRY=true
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/rust/apt-requirements-base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"bash-completion": "1:2.11-8",
"ca-certificates": "20240203",
"g++-13": "13.3.0-6ubuntu2~24.04",
"g++-14": "14.2.0-4ubuntu2~24.04",
"git": "1:2.43.0-1ubuntu7.1",
"gnupg2": "2.4.4-2ubuntu17",
"libc6-dev": "2.39-0ubuntu8.3",
Expand Down
1 change: 1 addition & 0 deletions test/cpp/workspace/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.30)
project(devcontainer-test LANGUAGES ASM C CXX)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_SCAN_FOR_MODULES Off)

include(CTest)
include(GoogleTest)
Expand Down
Loading