Fix bug where older Clang versions would use recent libc++

Address this issue with improved package masking.

Also unwind the unnecessary separate stdlib_version parameter.

Also bump GCC 12 version and fix heredocs.

Author: ednolan

.github/workflows/fromsource_ci.yml

@@ -76,7 +76,6 @@ jobs:
           build-args: |
             compiler_kind=${{ matrix.compilers.kind }}
             compiler_version=${{ matrix.compilers.compiler-version }}
-            ${{ matrix.compilers.stdlib-version && format('stdlib_version={0}', matrix.compilers.stdlib-version) }}
           file: Dockerfile.fromsource
           push: true
           tags: ${{ steps.image_name.outputs.tags }}

.github/workflows/testing_ci.yml

@@ -40,8 +40,8 @@ jobs:
             compiler-version: 13.4.0
             tags: [13.4.0, 13]
           - kind: gcc
-            compiler-version: 12.4.0
-            tags: [12.4.0, 12]
+            compiler-version: 12.4.1_p20250704
+            tags: [12.4.1, 12]
           - kind: gcc
             compiler-version: 11.5.0
             tags: [11.5.0, 11]
@@ -53,7 +53,6 @@ jobs:
             tags: [19.1.7, 19]
           - kind: clang
             compiler-version: 18.1.8-r6
-            stdlib-version: 18.1.8
             tags: [18.1.6, 18]
           - kind: clang
             compiler-version: 17.0.6
@@ -93,7 +92,6 @@ jobs:
           build-args: |
             compiler_kind=${{ matrix.compilers.kind }}
             compiler_version=${{ matrix.compilers.compiler-version }}
-            ${{ matrix.compilers.stdlib-version && format('stdlib_version={0}', matrix.compilers.stdlib-version) }}
           file: Dockerfile.test
           push: true
           tags: ${{ steps.image_name.outputs.tags }}

Dockerfile.devcontainer

@@ -4,7 +4,7 @@ FROM mcr.microsoft.com/devcontainers/cpp:1-ubuntu-24.04
 ARG compiler_kind=gcc
 ARG compiler_version=14
 
-RUN bash <<EOF
+RUN bash <<"EOF"
     if ! id "vscode" &>/dev/null; then
         apt-get update && apt-get install -y sudo adduser
         useradd -ms /bin/bash -p "" vscode && usermod -aG sudo vscode
@@ -15,15 +15,15 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
 RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ noble main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
 RUN apt-get update && apt-get install -y cmake
 
-RUN bash <<EOF
+RUN bash <<"EOF"
   if [[ "$compiler_kind" == gcc ]] ; then
     apt-get install -y gcc-${compiler_version}
     apt-get install -y g++-${compiler_version}
     update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-"$compiler_version" 10
     update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-"$compiler_version" 10
   elif [[ "$compiler_kind" == clang ]] ; then
     wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/repository-key.gpg
-    cat > /etc/apt/sources.list.d/llvm-toolchain-noble-${compiler_version}.sources <<EOF2
+    cat > /etc/apt/sources.list.d/llvm-toolchain-noble-${compiler_version}.sources <<"EOF2"
 Types: deb
 URIs: http://apt.llvm.org/noble/
 Suites: llvm-toolchain-noble-${compiler_version}

Dockerfile.fromsource

@@ -3,8 +3,7 @@
 FROM gentoo/stage3:amd64-nomultilib-openrc
 ARG compiler_kind=clang-p2996
 ARG compiler_version=21.0.0.9999
-ARG stdlib_version=${compiler_version}
-RUN /bin/bash <<-EOF
+RUN /bin/bash <<"EOF"
     set -eux
     echo 'BINPKG_FORMAT="gpkg"' >> /etc/portage/make.conf
     echo 'FEATURES="getbinpkg"' >> /etc/portage/make.conf
@@ -14,14 +13,14 @@ RUN /bin/bash <<-EOF
     mkdir -p /etc/portage/repos.conf
 
     if [[ ${compiler_kind} == clang-p2996 ]] ; then
-      cat > /etc/portage/repos.conf/gentoo.conf <<- REPO_CONF
+      cat > /etc/portage/repos.conf/gentoo.conf <<"EOF2"
 [gentoo]
 location = /var/db/repos/gentoo
 sync-type = git
 sync-uri = https://github.com/bemanproject/container-infra-clang-p2996-gentoo.git
 auto-sync = yes
 sync-openpgp-key-refresh = no
-REPO_CONF
+EOF2
       rm -rf /var/db/repos/gentoo
       emerge --sync
     fi
@@ -31,12 +30,9 @@ REPO_CONF
     emerge dev-build/ninja
     emerge dev-util/gcovr
     if [[ ${compiler_kind} == clang* ]] ; then
-      emerge =llvm-core/clang-${compiler_version} --autounmask --autounmask-write || true
+      USE="libcxx" emerge =llvm-core/clang-${compiler_version} --autounmask --autounmask-write || true
       etc-update --automode -5
-      USE="libcxx" emerge =llvm-core/clang-runtime-${stdlib_version} --autounmask --autounmask-write || true
-      etc-update --automode -5
-      emerge =llvm-core/clang-${compiler_version}
-      USE="libcxx" emerge =llvm-core/clang-runtime-${stdlib_version}
+      USE="libcxx" emerge =llvm-core/clang-${compiler_version}
       ln -sv /usr/lib/llvm/${compiler_version%%.*}/bin/* /usr/local/bin/
     elif [[ ${compiler_kind} == gcc ]] ; then
       emerge =sys-devel/gcc-${compiler_version} --autounmask --autounmask-write || true

Dockerfile.test

@@ -3,8 +3,7 @@
 FROM gentoo/stage3:amd64-nomultilib-openrc
 ARG compiler_kind=clang
 ARG compiler_version=20.1.7
-ARG stdlib_version=${compiler_version}
-RUN /bin/bash <<-EOF
+RUN /bin/bash <<"EOF"
     set -eux
     echo 'BINPKG_FORMAT="gpkg"' >> /etc/portage/make.conf
     echo 'FEATURES="getbinpkg"' >> /etc/portage/make.conf
@@ -17,8 +16,22 @@ RUN /bin/bash <<-EOF
     emerge dev-vcs/git
     emerge dev-util/gcovr
     if [[ ${compiler_kind} == clang ]] ; then
-      emerge --getbinpkgonly =llvm-core/clang-${compiler_version}
-      USE="libcxx" emerge =llvm-core/clang-runtime-${stdlib_version}
+      use_params=''
+      case ${compiler_version%%.*} in
+        17)
+          emerge =dev-lang/python-3.12.11
+          use_params=python_single_target_python3_12 ;;
+      esac
+      echo ">llvm-runtimes/openmp-${compiler_version%%-r*}-r9999" >> /etc/portage/package.mask/llvm
+      echo ">llvm-core/llvm-common-${compiler_version%%-r*}-r9999" >> /etc/portage/package.mask/llvm
+      echo ">llvm-runtimes/compiler-rt-${compiler_version%%-r*}-r9999" >> /etc/portage/package.mask/llvm
+      echo ">llvm-runtimes/compiler-rt-sanitizers-${compiler_version%%-r*}-r9999" >> /etc/portage/package.mask/llvm
+      echo ">llvm-core/llvm-${compiler_version%%-r*}-r9999" >> /etc/portage/package.mask/llvm
+      echo ">llvm-core/llvmgold-${compiler_version%%\.*}-r9999" >> /etc/portage/package.mask/llvm
+      echo ">llvm-core/llvm-toolchain-symlinks-${compiler_version%%\.*}-r9999" >> /etc/portage/package.mask/llvm
+      echo ">llvm-core/clang-common-${compiler_version%%-r*}-r9999" >> /etc/portage/package.mask/llvm
+      echo ">llvm-core/clang-runtime-${compiler_version%%-r*}-r9999" >> /etc/portage/package.mask/llvm
+      USE="libcxx $use_params" emerge =llvm-core/clang-${compiler_version}
       ln -s /usr/lib/llvm/${compiler_version%%.*}/bin/* /usr/local/bin/
     elif [[ ${compiler_kind} == gcc ]] ; then
       emerge --getbinpkgonly =sys-devel/gcc-${compiler_version}