From 4a971b8122fc4f6cc2c87c7bfee60a829ae2373d Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Wed, 29 Oct 2025 05:24:13 -0600
Subject: [PATCH 1/3] Update compiler_wrapper/cc.sh: choose compiler in mode
 'ld'

## Description

Fixes **issue to be created** by checking which compiler is configured when the compiler wrapper is invoked in `ld` mode.

## Testing

Tested for a package that depends on Fortran only and that invokes `ld` directly during the build.
---
 .../spack_repo/builtin/packages/compiler_wrapper/cc.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh b/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh
index aae0b0b9486..bca8eff750d 100755
--- a/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh
+++ b/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh
@@ -339,7 +339,15 @@ case "$command" in
     ld|ld.gold|ld.lld)
         mode=ld
         if [ -z "$SPACK_CC_RPATH_ARG" ]; then
-            comp="CXX"
+	        if [ ! -z "$SPACK_CXX_RPATH_ARG" ]; then
+                comp="CXX"
+	        elif [ ! -z "$SPACK_FC_RPATH_ARG" ]; then
+                comp="FC"
+            elif [ ! -z "$SPACK_F77_RPATH_ARG" ]; then
+                comp="F77"
+            else
+                die "Cannot configure linker"
+	        fi
         fi
         ;;
     *)

From 5b0d0c7b01c6dc7120d319dc0ecdebd5f48542f8 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Wed, 29 Oct 2025 11:16:05 -0600
Subject: [PATCH 2/3] Update
 repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh

Co-authored-by: Greg Becker <becker33@llnl.gov>
---
 repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh b/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh
index bca8eff750d..ab0458bcd44 100755
--- a/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh
+++ b/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh
@@ -339,12 +339,10 @@ case "$command" in
     ld|ld.gold|ld.lld)
         mode=ld
         if [ -z "$SPACK_CC_RPATH_ARG" ]; then
-	        if [ ! -z "$SPACK_CXX_RPATH_ARG" ]; then
+	        if [ -n "$SPACK_CXX_RPATH_ARG" ]; then
                 comp="CXX"
-	        elif [ ! -z "$SPACK_FC_RPATH_ARG" ]; then
+	        elif [ -n "$SPACK_FC_RPATH_ARG" ]; then
                 comp="FC"
-            elif [ ! -z "$SPACK_F77_RPATH_ARG" ]; then
-                comp="F77"
             else
                 die "Cannot configure linker"
 	        fi

From 6ede28438af1bd5b4aa32622763a29c62e8074d2 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Fri, 5 Dec 2025 09:00:48 -0700
Subject: [PATCH 3/3] 
 repos/spack_repo/builtin/packages/compiler_wrapper/package.py: bump version
 to 1.1 and update sha256

---
 .../spack_repo/builtin/packages/compiler_wrapper/package.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/repos/spack_repo/builtin/packages/compiler_wrapper/package.py b/repos/spack_repo/builtin/packages/compiler_wrapper/package.py
index 330d43c3ee4..7dcc01b088a 100644
--- a/repos/spack_repo/builtin/packages/compiler_wrapper/package.py
+++ b/repos/spack_repo/builtin/packages/compiler_wrapper/package.py
@@ -37,12 +37,12 @@ class CompilerWrapper(Package):
 
     if sys.platform != "win32":
         version(
-            "1.0",
-            sha256="a5ff4fcdbeda284a7993b87f294b6338434cffc84ced31e4d04008ed5ea389bf",
+            "1.1",
+            sha256="0f1cc7699e803a0f00c1b40f7786f48be795a3924a61695090cc91c6d63069ac",
             expand=False,
         )
     else:
-        version("1.0")
+        version("1.1")
         has_code = False
 
     def bin_dir(self) -> pathlib.Path: