From ce81175cf30ce31b769c03561b0123de6e9e7cc4 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <me@harmenstoppels.nl>
Date: Fri, 19 Jan 2024 17:59:41 +0100
Subject: Revert "cc: work around -v split between ld and ccld" (#42196)

---
 lib/spack/env/cc           | 11 +----------
 lib/spack/spack/test/cc.py |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index ffd1df8c7a..f72a6663a3 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -283,19 +283,10 @@ esac
 if [ -z "$mode" ] || [ "$mode" = ld ]; then
     for arg in "$@"; do
         case $arg in
-            -V|--version|-dumpversion)
+            -v|-V|--version|-dumpversion)
                 mode=vcheck
                 break
                 ;;
-            -v)
-                # NOTE(trws): -v is verbose on gcc, not version, this is an ld-mode flag only
-                # -V is invalid on gcc but may be valid on some other compiler so leaving that in
-                case "$mode" in
-                    ld)
-                        mode=vcheck
-                        break
-                        ;;
-                esac
         esac
     done
 fi
diff --git a/lib/spack/spack/test/cc.py b/lib/spack/spack/test/cc.py
index 16b5f828a4..25aab774a7 100644
--- a/lib/spack/spack/test/cc.py
+++ b/lib/spack/spack/test/cc.py
@@ -244,10 +244,10 @@ def test_no_wrapper_environment():
 def test_vcheck_mode(wrapper_environment):
     assert dump_mode(cc, ["-I/include", "--version"]) == "vcheck"
     assert dump_mode(cc, ["-I/include", "-V"]) == "vcheck"
+    assert dump_mode(cc, ["-I/include", "-v"]) == "vcheck"
     assert dump_mode(cc, ["-I/include", "-dumpversion"]) == "vcheck"
     assert dump_mode(cc, ["-I/include", "--version", "-c"]) == "vcheck"
     assert dump_mode(cc, ["-I/include", "-V", "-o", "output"]) == "vcheck"
-    assert dump_mode(ld, ["-I/include", "-v"]) == "vcheck"
 
 
 def test_cpp_mode(wrapper_environment):
-- 
cgit v1.2.3-70-g09d2