From b1963173743c5a86c75ccee57bf6c0a4081ab806 Mon Sep 17 00:00:00 2001
From: Tim Perkins <code@taughz.dev>
Date: Sat, 6 Jun 2026 15:55:08 -0400
Subject: [PATCH] Install missing C++ standard library

By default Clang uses `libstdc++-12-dev`, which it was built against, so
that needs to be installed. Alternatively, it's possible to use
`libc++-16-dev`, so that is being installed as well.
---
 containers/cpp/Containerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/containers/cpp/Containerfile b/containers/cpp/Containerfile
index 69ec870..d30df88 100644
--- a/containers/cpp/Containerfile
+++ b/containers/cpp/Containerfile
@@ -46,12 +46,15 @@ RUN curl -fL "$LLVM_KEY_URL" | gpg --dearmor > $LLVM_KEY_FILE \
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         clang-16 \
-        lld-16 \
-        lldb-16 \
         clang-format-16 \
         clangd-16 \
-        llvm-16-dev \
+        libc++-16-dev \
+        libc++abi-16-dev \
         libclang-16-dev \
+        libstdc++-12-dev \
+        lld-16 \
+        lldb-16 \
+        llvm-16-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Make aliases for some Clang tools