From 504f1aea13bf7fa09283fa61ab23c7d8623dda4b Mon Sep 17 00:00:00 2001 From: Michael Schellenberger Costa Date: Tue, 11 Nov 2025 12:09:13 +0100 Subject: [PATCH 1/3] Add libc++ to our clang devcontainers --- matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix.yml b/matrix.yml index a7679471..db08e487 100644 --- a/matrix.yml +++ b/matrix.yml @@ -41,7 +41,7 @@ x-openmpi: &openmpi { name: "openmpi", version: "5.0.7" } x-cccl-dev: &cccl_dev { name: "cccl-dev", hide: true, doxygenVersion: "1.9.6" } x-clangd-dev: &clangd_dev { name: "llvm", version: "dev", packages: "clangd", hide: true } -x-clang-format-cccl: &clang_format_cccl { name: "llvm", version: "21", packages: "clang-format llvm-tools", hide: true } +x-clang-format-cccl: &clang_format_cccl { name: "llvm", version: "21", packages: "clang-format llvm-tools libc++ libc++abi libunwind", hide: true } x-clang-format-rapids: &clang_format_rapids { name: "llvm", version: "16", packages: "clang-format", hide: true } # Docker outside of Docker used to build python wheels: x-dood: &dood { name: "ghcr.io/devcontainers/features/docker-outside-of-docker:1", moby: false, hide: true} From 1805e7bdac98684e67fe18d558110e5785b3d00f Mon Sep 17 00:00:00 2001 From: Michael Schellenberger Costa Date: Tue, 11 Nov 2025 13:38:42 +0100 Subject: [PATCH 2/3] Also install libc++ to llvm devcontainers --- features/src/llvm/llvm.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/features/src/llvm/llvm.sh b/features/src/llvm/llvm.sh index 817379c2..4b0e1bd3 100755 --- a/features/src/llvm/llvm.sh +++ b/features/src/llvm/llvm.sh @@ -182,6 +182,11 @@ if [[ "${PKG[*]}" == "" ]]; then PKG+=("lldb-${LLVM_VERSION}"); PKG+=("lld-${LLVM_VERSION}"); PKG+=("clangd-${LLVM_VERSION}"); + PKG+=("libc++-${LLVM_VERSION}-dev"); + PKG+=("libc++abi-${LLVM_VERSION}-dev"); + if test "${LLVM_VERSION}" -gt 11; then + PKG+=("libunwind-${LLVM_VERSION}-dev"); + fi elif [[ "${PKG[*]}" == "all" ]]; then # same as in test-install.sh # No worries if we have dups From d5124ad90d0f8bef8d3163684625aac2869ccbea Mon Sep 17 00:00:00 2001 From: Michael Schellenberger Costa Date: Tue, 11 Nov 2025 13:40:57 +0100 Subject: [PATCH 3/3] Drop old change --- matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix.yml b/matrix.yml index db08e487..a7679471 100644 --- a/matrix.yml +++ b/matrix.yml @@ -41,7 +41,7 @@ x-openmpi: &openmpi { name: "openmpi", version: "5.0.7" } x-cccl-dev: &cccl_dev { name: "cccl-dev", hide: true, doxygenVersion: "1.9.6" } x-clangd-dev: &clangd_dev { name: "llvm", version: "dev", packages: "clangd", hide: true } -x-clang-format-cccl: &clang_format_cccl { name: "llvm", version: "21", packages: "clang-format llvm-tools libc++ libc++abi libunwind", hide: true } +x-clang-format-cccl: &clang_format_cccl { name: "llvm", version: "21", packages: "clang-format llvm-tools", hide: true } x-clang-format-rapids: &clang_format_rapids { name: "llvm", version: "16", packages: "clang-format", hide: true } # Docker outside of Docker used to build python wheels: x-dood: &dood { name: "ghcr.io/devcontainers/features/docker-outside-of-docker:1", moby: false, hide: true}