Switch to gcc10 instead of gcc9 for chip build base

project-chip · Aug 2, 2023 · ade645a · ade645a
1 parent 0bb6543
commit ade645a
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/integrations/docker/images/base/chip-build/Dockerfile b/integrations/docker/images/base/chip-build/Dockerfile
@@ -41,7 +41,7 @@ RUN set -x \
     clang-tidy \
     curl \
     flex \
-    g++ \
+    g++-10 \
     git \
     git-lfs \
     gperf \
@@ -98,6 +98,16 @@ RUN set -x \
     && git lfs install \
     && : # last line
 
+# Set gcc 10 as a default compiler to work with TSAN
+RUN set -x \
+    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10 \
+    && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10 \
+    && 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++ \
+    && : # last line
+
 # Cmake v3.23.1
 ENV CMAKE_PLATFORM_VERSION=
 RUN case ${TARGETPLATFORM} in \