(nuttx) branch master updated: upgrade to gcc 12 in docker

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new b0f245b33f upgrade to gcc 12 in docker
b0f245b33f is described below

commit b0f245b33f884426ee8ea3b41bf163497b3f51fa
Author: ThomasNS <th...@wandercraft.eu>
AuthorDate: Wed Dec 6 15:55:17 2023 +0100

    upgrade to gcc 12 in docker
---
 tools/ci/docker/linux/Dockerfile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile
index df318b7f6a..26a1278d53 100644
--- a/tools/ci/docker/linux/Dockerfile
+++ b/tools/ci/docker/linux/Dockerfile
@@ -273,9 +273,9 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q
   ccache \
   clang \
   clang-tidy \
-  g++-multilib \
+  g++-12-multilib \
   gcc-avr \
-  gcc-multilib \
+  gcc-12-multilib \
   genromfs \
   gettext \
   git \
@@ -308,6 +308,14 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q
   xxd \
   && rm -rf /var/lib/apt/lists/*
 
+# Set GCC-12 as Default compiler
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 20 && \
+  update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 20 && \
+  update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30 && \
+  update-alternatives --set cc /usr/bin/gcc && \
+  update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30 && \
+  update-alternatives --set c++ /usr/bin/g++
+
 # Configure out base setup for adding python packages
 ENV PIP_DISABLE_PIP_VERSION_CHECK=true
 # This disables the cache with value 0. We do not want caching as it