Skip to content

Commit 1079808

Browse files
andy31415andreilitvin
authored andcommitted
[docker] Use gcc 10 in chip build (#28478)
* Switch to gcc10 instead of gcc9 for chip build base * Bump up version file * Add -Dtests=false --------- Co-authored-by: Andrei Litvin <[email protected]>
1 parent 1160a4c commit 1079808

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

integrations/docker/images/base/chip-build/Dockerfile

+12-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ RUN set -x \
4141
clang-tidy \
4242
curl \
4343
flex \
44-
g++ \
44+
g++-10 \
4545
git \
4646
git-lfs \
4747
gperf \
@@ -98,6 +98,16 @@ RUN set -x \
9898
&& git lfs install \
9999
&& : # last line
100100

101+
# Set gcc 10 as a default compiler to work with TSAN
102+
RUN set -x \
103+
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10 \
104+
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10 \
105+
&& update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30 \
106+
&& update-alternatives --set cc /usr/bin/gcc \
107+
&& update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30 \
108+
&& update-alternatives --set c++ /usr/bin/g++ \
109+
&& : # last line
110+
101111
# Cmake v3.23.1
102112
ENV CMAKE_PLATFORM_VERSION=
103113
RUN case ${TARGETPLATFORM} in \
@@ -206,7 +216,7 @@ RUN case ${TARGETPLATFORM} in \
206216
&& export CCACHE_DISABLE=1 PYTHONDONTWRITEBYTECODE=1 \
207217
&& GLIB_VERSION=$(pkg-config --modversion glib-2.0) \
208218
&& git clone --depth=1 --branch=$GLIB_VERSION https://github.com/GNOME/glib.git \
209-
&& CFLAGS="-O2 -g -fsanitize=thread" meson glib/build glib \
219+
&& CFLAGS="-O2 -g -fsanitize=thread" meson glib/build glib -Dtests=false \
210220
&& DESTDIR=../build-image ninja -C glib/build install \
211221
&& mv glib/build-image/usr/local/lib/x86_64-linux-gnu/lib* $LD_LIBRARY_PATH_TSAN \
212222
&& rm -rf glib \
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2 : Update esp-idf to v5.1 and remove few pinned package version
1+
3 : Update to gcc-10

0 commit comments

Comments
 (0)