commit e347f825463040930c159ab48db49f6ac120a8b6
author Patrick Williams <patrick@stwcx.xyz> Thu Jul 24 10:00:45 2025 -0400
committer Patrick Williams <patrick@stwcx.xyz> Mon Oct 20 10:18:17 2025 -0400
tree 03aba68b7481a7be1d6d928edf5a3a39f453a20f
parent eae557cf65c82b4647fb7e3af2866b7025559fb0

build-unit-test-docker: use ubuntu-toolchain-r for gcc

Ubuntu plucky uses GCC-15.0, which has a few known bugs.  Switch
to picking up GCC from the ubuntu-toolchain-r repository, which
currently has GCC-15.2.

One specific issue the community has encountered included with
this fixes is reported by Google Test[1].

[1]: https://github.com/google/googletest/issues/4759

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Id7f9cfd9c6292334b79c6c417c11210910876f06

scripts/build-unit-test-docker

diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index 9887f78..8a5fb5b 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -888,8 +888,6 @@
     device-tree-compiler \
     doxygen \
     flex \
-    g++-15 \
-    gcc-15 \
     git \
     glib-2.0 \
     gnupg \
@@ -950,6 +948,14 @@
     wget \
     xxd
 
+# Add the ubuntu-toolchain-r repository for later versions of GCC and install.
+RUN add-apt-repository ppa:ubuntu-toolchain-r/ppa && \
+    apt-get update && \
+    apt-get install -y \
+        gcc-15 \
+        g++-15 \
+        libstdc++-15-dev
+
 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-15 15 \
   --slave /usr/bin/g++ g++ /usr/bin/g++-15 \
   --slave /usr/bin/gcov gcov /usr/bin/gcov-15 \