Skip to content

Commit

Permalink
[docker] Use gcc 10 in chip build (#28478)
Browse files Browse the repository at this point in the history
* Switch to gcc10 instead of gcc9 for chip build base

* Bump up version file

* Add -Dtests=false

---------

Co-authored-by: Andrei Litvin <andreilitvin@google.com>
  • Loading branch information
2 people authored and pull[bot] committed Mar 5, 2024
1 parent 1160a4c commit 1079808
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
14 changes: 12 additions & 2 deletions integrations/docker/images/base/chip-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN set -x \
clang-tidy \
curl \
flex \
g++ \
g++-10 \
git \
git-lfs \
gperf \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -206,7 +216,7 @@ RUN case ${TARGETPLATFORM} in \
&& export CCACHE_DISABLE=1 PYTHONDONTWRITEBYTECODE=1 \
&& GLIB_VERSION=$(pkg-config --modversion glib-2.0) \
&& git clone --depth=1 --branch=$GLIB_VERSION https://github.com/GNOME/glib.git \
&& CFLAGS="-O2 -g -fsanitize=thread" meson glib/build glib \
&& CFLAGS="-O2 -g -fsanitize=thread" meson glib/build glib -Dtests=false \
&& DESTDIR=../build-image ninja -C glib/build install \
&& mv glib/build-image/usr/local/lib/x86_64-linux-gnu/lib* $LD_LIBRARY_PATH_TSAN \
&& rm -rf glib \
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/base/chip-build/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2 : Update esp-idf to v5.1 and remove few pinned package version
3 : Update to gcc-10

0 comments on commit 1079808

Please sign in to comment.