diff --git a/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh b/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh
index ba2b867dd54..d15de77431e 100755
--- a/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh
+++ b/repos/spack_repo/builtin/packages/compiler_wrapper/cc.sh
@@ -343,7 +343,13 @@ case "$command" in
     ld|ld.gold|ld.lld)
         mode=ld
         if [ -z "$SPACK_CC_RPATH_ARG" ]; then
-            comp="CXX"
+	        if [ -n "$SPACK_CXX_RPATH_ARG" ]; then
+                comp="CXX"
+	        elif [ -n "$SPACK_FC_RPATH_ARG" ]; then
+                comp="FC"
+            else
+                die "Cannot configure linker"
+	        fi
         fi
         ;;
     *)
diff --git a/repos/spack_repo/builtin/packages/compiler_wrapper/package.py b/repos/spack_repo/builtin/packages/compiler_wrapper/package.py
index cb64f06209a..f95f9c0806c 100644
--- a/repos/spack_repo/builtin/packages/compiler_wrapper/package.py
+++ b/repos/spack_repo/builtin/packages/compiler_wrapper/package.py
@@ -39,12 +39,12 @@ class CompilerWrapper(Package):
 
     if sys.platform != "win32":
         version(
-            "1.0",
-            sha256="c7b816479554fd32f677db15ceec6627b91c86074a5d65498688afcbe2796188",
+            "1.1",
+            sha256="baecd8bff673e8bf338a7f81368c378948b0d97d24ba29f1b29fd6aa9606165b",
             expand=False,
         )
     else:
-        version("1.0")
+        version("1.1")
         has_code = False
 
     def bin_dir(self) -> pathlib.Path: