From 2ae240c4021b4c7981988494778c6281efcb92db Mon Sep 17 00:00:00 2001 From: Neil Dhar Date: Wed, 8 Oct 2025 09:40:24 -0700 Subject: [PATCH] Use libstdc++ from system toolchain for AlmaLinux The AlmaLinux build currently builds against libstdc++ from GCC 14, because installing clang also pulls in GCC 14, and clang automatically picks the newest libstdc++ on the system. Instead, pointing clang to the system GCC installation should link against the corresponding libstdc++. This improves the portability of the generated binaries. The AlmaLinux binaries should now be compatible with a superset of the systems that the Ubuntu binaries are compatible with. We can then separately evaluate removing the Ubuntu build if this works for all users. (I assume these have to be separate changes anyway for CI) --- .github/workflows/llvm-build/almalinux.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/llvm-build/almalinux.Dockerfile b/.github/workflows/llvm-build/almalinux.Dockerfile index ad8e2f4438ef..b45433b1c0f3 100644 --- a/.github/workflows/llvm-build/almalinux.Dockerfile +++ b/.github/workflows/llvm-build/almalinux.Dockerfile @@ -25,7 +25,8 @@ RUN cmake -GNinja -Bbuild \ -DCMAKE_ASM_COMPILER=clang \ -DCMAKE_C_COMPILER_LAUNCHER=sccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \ - -DCMAKE_CXX_FLAGS="-Wno-everything" \ + -DCMAKE_C_FLAGS="--gcc-install-dir=/usr/lib/gcc/$(gcc -dumpmachine)/8" \ + -DCMAKE_CXX_FLAGS="--gcc-install-dir=/usr/lib/gcc/$(gcc -dumpmachine)/8 -Wno-everything" \ -DCMAKE_LINKER=lld \ -DCMAKE_INSTALL_PREFIX="/install" \ -DPython3_EXECUTABLE="/usr/bin/python3.8" \