diff options
| author | Harmen Stoppels <me@harmenstoppels.nl> | 2024-01-19 17:59:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-19 17:59:41 +0100 |
| commit | ce81175cf30ce31b769c03561b0123de6e9e7cc4 (patch) | |
| tree | 44c54665d8b68a1736eea0c9cdd4c2cb0b28f2d3 /lib | |
| parent | c31a998abb9f0b82a59bbfbf55b8111847aac8cb (diff) | |
| download | spack-ce81175cf30ce31b769c03561b0123de6e9e7cc4.tar.gz spack-ce81175cf30ce31b769c03561b0123de6e9e7cc4.tar.bz2 spack-ce81175cf30ce31b769c03561b0123de6e9e7cc4.tar.xz spack-ce81175cf30ce31b769c03561b0123de6e9e7cc4.zip | |
Revert "cc: work around -v split between ld and ccld" (#42196)
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/spack/env/cc | 11 | ||||
| -rw-r--r-- | lib/spack/spack/test/cc.py | 2 |
2 files changed, 2 insertions, 11 deletions
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): |