From 25856ec80c87ead8d192aae2c7190292736d74e0 Mon Sep 17 00:00:00 2001
From: Peter Josef Scheibel <scheibel1@llnl.gov>
Date: Thu, 11 Jun 2026 15:47:15 -0700
Subject: [PATCH 1/4] init changes from spack-packages/4411

---
 cc.sh | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/cc.sh b/cc.sh
index d0a6f90..e243828 100755
--- a/cc.sh
+++ b/cc.sh
@@ -298,9 +298,37 @@ mode=""
 vdep=""
 lang_flags=""
 debug_flags=""
-command="${0##*/}"
 comp="CC"
 vcheck_flags=""
+
+command_from_argv0="${0##*/}"
+command="$command_from_argv0"
+
+_command_from_flags() {
+    while [ $# -ne 0 ]; do
+        arg="$1"
+        shift
+        case "$arg" in
+            -x|--language)
+                _lang="$1"
+                shift ;;
+            -x*)
+                _lang="${arg#-x}" ;;
+            --language=*)
+                _lang="${arg#--language=}" ;;
+            *) continue ;;
+        esac
+    done
+
+    case "$_lang" in
+        c) command=cc ;;
+        c++|f77|f95|hip) command="$_lang" ;;
+        *) command="$command_from_argv0" ;;  # drop unknown languages
+    esac
+}
+
+_command_from_flags "$@"
+
 case "$command" in
     cpp)
         mode=cpp
@@ -339,6 +367,14 @@ case "$command" in
         debug_flags="-g"
         vcheck_flags="${SPACK_ALWAYS_FFLAGS}"
         ;;
+    hip)
+        command="$SPACK_HIPCXX"
+        language="HIP"
+        comp="HIPCXX"
+        lang_flags=HIP
+        debug_flags="-g"
+        vcheck_flags="${SPACK_ALWAYS_HIPCXXFLAGS}"
+        ;;
     ld|ld.gold|ld.lld)
         mode=ld
         if [ -z "$SPACK_CC_RPATH_ARG" ]; then

From 080bdfba890edc1b4411f0fd4b9d33b87037d87f Mon Sep 17 00:00:00 2001
From: Peter Josef Scheibel <scheibel1@llnl.gov>
Date: Thu, 11 Jun 2026 16:02:54 -0700
Subject: [PATCH 2/4] dispatch hipcc to SPACK_HIPCXX

---
 cc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cc.sh b/cc.sh
index e243828..532c271 100755
--- a/cc.sh
+++ b/cc.sh
@@ -367,7 +367,7 @@ case "$command" in
         debug_flags="-g"
         vcheck_flags="${SPACK_ALWAYS_FFLAGS}"
         ;;
-    hip)
+    hip|hipcc)
         command="$SPACK_HIPCXX"
         language="HIP"
         comp="HIPCXX"

From 2b8ef4ef537cb2dece32f88d571b128220bd824a Mon Sep 17 00:00:00 2001
From: Peter Josef Scheibel <scheibel1@llnl.gov>
Date: Fri, 12 Jun 2026 15:43:25 -0700
Subject: [PATCH 3/4] names that cmake won't reject

---
 cc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cc.sh b/cc.sh
index 532c271..2e5476a 100755
--- a/cc.sh
+++ b/cc.sh
@@ -367,7 +367,7 @@ case "$command" in
         debug_flags="-g"
         vcheck_flags="${SPACK_ALWAYS_FFLAGS}"
         ;;
-    hip|hipcc)
+    hip|spackhip|amdhip)
         command="$SPACK_HIPCXX"
         language="HIP"
         comp="HIPCXX"

From d6cc6b2d3d45e966684c702ee28ecd2ff400b4c2 Mon Sep 17 00:00:00 2001
From: Peter Josef Scheibel <scheibel1@llnl.gov>
Date: Thu, 9 Jul 2026 16:49:03 -0700
Subject: [PATCH 4/4] amdhip identifier not used; language was swapped with
 vdep

---
 cc.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cc.sh b/cc.sh
index 2e5476a..4f04ebe 100755
--- a/cc.sh
+++ b/cc.sh
@@ -367,9 +367,9 @@ case "$command" in
         debug_flags="-g"
         vcheck_flags="${SPACK_ALWAYS_FFLAGS}"
         ;;
-    hip|spackhip|amdhip)
+    hip|spackhip)
         command="$SPACK_HIPCXX"
-        language="HIP"
+        vdep="spack-hip"
         comp="HIPCXX"
         lang_flags=HIP
         debug_flags="-g"