More games with quoting

2016-02-13 22:01:36 -05:00 · 2016-02-13 22:01:36 -05:00 · 43670cbbd0
commit 43670cbbd0
parent 52647b9a5d
1 changed files with 5 additions and 6 deletions
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@ -175,20 +175,19 @@ while [ -n "$1" ]; do
            ;;
        -Wl,*)
            arg="${1#-Wl,}"
-            if [ -z "$arg" ]; then shift; arg="$1"; fi
-            if [[ $arg =~ -rpath=.* ]]; then
+            if [[ $arg = "-rpath=*" ]]; then
                arg="${arg#-rpath=}"
                for rpath in ${arg//,/ }; do
                    rpaths+=("$rpath")
                done
-            elif [[ $arg =~ -rpath,.* ]]; then
+            elif [[ $arg = "-rpath,*" ]]; then
                arg="${arg#-rpath,}"
                for rpath in ${arg//,/ }; do
-                                        rpaths+=("$rpath")
+                    rpaths+=("$rpath")
                done
-            elif [[ $arg = -rpath ]]; then
+            elif [[ $arg = "-rpath" ]]; then
                shift; arg="$1"
-                if [[ $arg != -Wl,* ]]; then
+                if [[ $arg != "-Wl,*" ]]; then
                    die "-Wl,-rpath was not followed by -Wl,*"
                fi
                # TODO: Handle multiple -Wl, continuations of -Wl,-rpath