From f633166ca7d59bd726893a8ac652a426bfcf324c Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 30 Sep 2025 07:40:19 -0700
Subject: [PATCH] rocmPackages.llvm: rename rocmcxx to rocm-toolchain

Previous name was inaccurate.
---
 pkgs/development/rocm-modules/6/clr/default.nix      |  1 +
 pkgs/development/rocm-modules/6/llvm/default.nix     | 12 ++++++------
 pkgs/development/rocm-modules/6/rocm-smi/default.nix |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix
index 15c742fc4b70..90af58ad1203 100644
--- a/pkgs/development/rocm-modules/6/clr/default.nix
+++ b/pkgs/development/rocm-modules/6/clr/default.nix
@@ -13,6 +13,7 @@
   rocm-device-libs,
   rocm-comgr,
   rocm-runtime,
+  rocm-toolchain,
   rocm-core,
   roctracer,
   rocminfo,
diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix
index 086e934bea5f..8b54aeade9a8 100644
--- a/pkgs/development/rocm-modules/6/llvm/default.nix
+++ b/pkgs/development/rocm-modules/6/llvm/default.nix
@@ -71,7 +71,7 @@ let
     stdenvToBuildRocmLlvm.cc
     stdenvToBuildRocmLlvm.cc.cc
   ];
-  # A prefix for use as the GCC prefix when building rocmcxx
+  # A prefix for use as the GCC prefix when building rocm-toolchain
   gcc-prefix-headers = symlinkJoin {
     name = "gcc-prefix-headers";
     paths = [
@@ -149,7 +149,7 @@ let
     runCommand name
       {
         # If this is erroring, try why-depends --precise on the symlinkJoin of inputs to look for the problem
-        # nix why-depends --precise .#rocmPackages.llvm.rocmcxx.linked /store/path/its/not/allowed
+        # nix why-depends --precise .#rocmPackages.llvm.rocm-toolchain.linked /store/path/its/not/allowed
         disallowedRequisites = disallowedRefsForToolchain;
         passthru.linked = linked;
       }
@@ -384,7 +384,7 @@ rec {
             (builtins.filter tablegenUsage old.cmakeFlags)
             ++ commonCmakeFlags
             ++ lib.optionals (!withLibcxx) [
-              # FIXME: Config file in rocmcxx instead of GCC_INSTALL_PREFIX?
+              # FIXME: Config file in rocm-toolchain instead of GCC_INSTALL_PREFIX?
               # Expected to be fully removed eventually
               "-DUSE_DEPRECATED_GCC_INSTALL_PREFIX=ON"
               "-DGCC_INSTALL_PREFIX=${gcc-prefix}"
@@ -407,7 +407,7 @@ rec {
   # A clang that understands standard include searching in a GNU sysroot and will put GPU libs in include path
   # in the right order
   # and expects its libc to be in the sysroot
-  rocmcxx =
+  rocm-toolchain =
     (sysrootCompiler clang-unwrapped "rocmcxx" (
       listUsefulOutputs (
         [
@@ -428,7 +428,7 @@ rec {
     ))
     // {
       version = llvmMajorVersion;
-      cc = rocmcxx;
+      cc = rocm-toolchain;
       libllvm = llvm;
       isClang = true;
       isGNU = false;
@@ -460,7 +460,7 @@ rec {
     };
   };
 
-  clang = rocmcxx;
+  clang = rocm-toolchain;
 
   # Emulate a monolithic ROCm LLVM build to support building ROCm's in-tree LLVM projects
   # TODO(@LunNova): destroy this
diff --git a/pkgs/development/rocm-modules/6/rocm-smi/default.nix b/pkgs/development/rocm-modules/6/rocm-smi/default.nix
index f146d6f9fb43..15477b7e9d9e 100644
--- a/pkgs/development/rocm-modules/6/rocm-smi/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-smi/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
       mv $out/libexec/rocm_smi/.rsmiBindings.py-wrapped $out/libexec/rocm_smi/rsmiBindings.py
     ''
     # workaround: propagate libdrm/ manually
-    # rocmcxx doesn't automatically add buildInputs to isystem include path like
+    # rocm-toolchain doesn't automatically add buildInputs to isystem include path like
     # wrapper based toolchains, cmake files often don't find_package(rocm-smi) so
     # can't rely on cmake propagated interface
     # upstream have been shipping libdrm copied into /opt/rocm