From 8dc420ca98746ae3946bc3e9051f9aeece6ad800 Mon Sep 17 00:00:00 2001
From: Jacob Faibussowitsch <jacob.fai@gmail.com>
Date: Wed, 15 Jul 2026 15:31:11 -0400
Subject: [PATCH 1/2] Install debugger init files

---
 features/src/cccl-dev/.gdbinit   | 5 +++++
 features/src/cccl-dev/.lldbinit  | 1 +
 features/src/cccl-dev/install.sh | 6 ++++++
 3 files changed, 12 insertions(+)
 create mode 100644 features/src/cccl-dev/.gdbinit
 create mode 100644 features/src/cccl-dev/.lldbinit

diff --git a/features/src/cccl-dev/.gdbinit b/features/src/cccl-dev/.gdbinit
new file mode 100644
index 000000000..e1d051af0
--- /dev/null
+++ b/features/src/cccl-dev/.gdbinit
@@ -0,0 +1,5 @@
+set print pretty on
+set print array-indexes on
+
+set auto-load local-gdbinit on
+add-auto-load-safe-path @CCCL_DIR@/.gdbinit
diff --git a/features/src/cccl-dev/.lldbinit b/features/src/cccl-dev/.lldbinit
new file mode 100644
index 000000000..eccb25e54
--- /dev/null
+++ b/features/src/cccl-dev/.lldbinit
@@ -0,0 +1 @@
+settings set target.load-cwd-lldbinit true
diff --git a/features/src/cccl-dev/install.sh b/features/src/cccl-dev/install.sh
index 086fca7db..b80d53445 100644
--- a/features/src/cccl-dev/install.sh
+++ b/features/src/cccl-dev/install.sh
@@ -86,6 +86,12 @@ append_to_all_bashrcs "$(cat .bashrc | envsubst '$LIT_VERSION $DOXYGEN_VERSION $
 # export envvars in /etc/profile.d
 add_etc_profile_d_script cccl-dev "$(cat .bashrc | envsubst '$LIT_VERSION $DOXYGEN_VERSION $USERHOME')";
 
+cccl_dir="${USERHOME}/cccl"
+# install global lldbinit and gdbinit, append in case there is a pre-existing one
+# installed by the OS or packages
+cat .lldbinit | sed -e "s%@CCCL_DIR@%${cccl_dir}%" >> "${USERHOME}/.lldbinit";
+cat .gdbinit | sed -e "s%@CCCL_DIR@%${cccl_dir}%" >> "${USERHOME}/.gdbinit";
+
 # Clean up
 # rm -rf /tmp/*;
 rm -rf /var/tmp/*;

From 55581878e4ec6b38cfcbbc001143a5879dba0ebe Mon Sep 17 00:00:00 2001
From: Jacob Faibussowitsch <jacob.fai@gmail.com>
Date: Wed, 15 Jul 2026 16:18:40 -0400
Subject: [PATCH 2/2] fixup! Install debugger init files

---
 features/src/cccl-dev/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/cccl-dev/devcontainer-feature.json b/features/src/cccl-dev/devcontainer-feature.json
index 1b030aa90..d8063d3ee 100644
--- a/features/src/cccl-dev/devcontainer-feature.json
+++ b/features/src/cccl-dev/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA CCCL development utilities",
   "id": "cccl-dev",
-  "version": "26.8.1",
+  "version": "26.8.2",
   "description": "A feature to install NVIDIA CCCL development utilities",
   "options": {
     "litVersion": {