File tree 2 files changed +13
-3
lines changed
integrations/docker/images/base/chip-build
2 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ RUN set -x \
41
41
clang-tidy \
42
42
curl \
43
43
flex \
44
- g++ \
44
+ g++-10 \
45
45
git \
46
46
git-lfs \
47
47
gperf \
@@ -98,6 +98,16 @@ RUN set -x \
98
98
&& git lfs install \
99
99
&& : # last line
100
100
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
+
101
111
# Cmake v3.23.1
102
112
ENV CMAKE_PLATFORM_VERSION=
103
113
RUN case ${TARGETPLATFORM} in \
@@ -206,7 +216,7 @@ RUN case ${TARGETPLATFORM} in \
206
216
&& export CCACHE_DISABLE=1 PYTHONDONTWRITEBYTECODE=1 \
207
217
&& GLIB_VERSION=$(pkg-config --modversion glib-2.0) \
208
218
&& 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 \
210
220
&& DESTDIR=../build-image ninja -C glib/build install \
211
221
&& mv glib/build-image/usr/local/lib/x86_64-linux-gnu/lib* $LD_LIBRARY_PATH_TSAN \
212
222
&& rm -rf glib \
Original file line number Diff line number Diff line change 1
- 2 : Update esp-idf to v5.1 and remove few pinned package version
1
+ 3 : Update to gcc-10
You can’t perform that action at this time.
0 commit comments