From 43670cbbd01562f6748f3ee6e2505be52e24bccb Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@gmail.com>
Date: Sat, 13 Feb 2016 22:01:36 -0500
Subject: More games with quoting

---
 lib/spack/env/cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index c46986e19c..37483e0073 100755
--- 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
-- 
cgit v1.2.3-70-g09d2