diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2016-02-13 17:55:14 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2016-02-13 17:55:14 -0500 |
| commit | 52647b9a5d8ab4b2fff7387f65347164576be088 (patch) | |
| tree | 6fe645537e69af2eea4b82492a1dda84b8c4ab53 | |
| parent | 69064395eb61db3b03d1ed14f16bef7ec2c94ee3 (diff) | |
| download | spack-52647b9a5d8ab4b2fff7387f65347164576be088.tar.gz spack-52647b9a5d8ab4b2fff7387f65347164576be088.tar.bz2 spack-52647b9a5d8ab4b2fff7387f65347164576be088.tar.xz spack-52647b9a5d8ab4b2fff7387f65347164576be088.zip | |
Using regexes instead of globbing to match path names
| -rwxr-xr-x | lib/spack/env/cc | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/spack/env/cc b/lib/spack/env/cc index a431cffacf..c46986e19c 100755 --- a/lib/spack/env/cc +++ b/lib/spack/env/cc @@ -174,26 +174,19 @@ while [ -n "$1" ]; do libs+=("$arg") ;; -Wl,*) - echo "FOUND arg=[$arg]" >&2 arg="${1#-Wl,}" if [ -z "$arg" ]; then shift; arg="$1"; fi - echo "SHIFTED, arg=[$arg]" >&2 - if [[ $arg = -rpath=* ]]; then - echo "CASE 1" >&2 + if [[ $arg =~ -rpath=.* ]]; then arg="${arg#-rpath=}" for rpath in ${arg//,/ }; do - echo " RPATH=[$rpath]" >&2 rpaths+=("$rpath") done - elif [[ $arg = -rpath,* ]]; then - echo "CASE 2" >&2 + elif [[ $arg =~ -rpath,.* ]]; then arg="${arg#-rpath,}" for rpath in ${arg//,/ }; do - echo " RPATH=[$rpath]" >&2 - rpaths+=("$rpath") + rpaths+=("$rpath") done elif [[ $arg = -rpath ]]; then - echo "CASE 3" >&2 shift; arg="$1" if [[ $arg != -Wl,* ]]; then die "-Wl,-rpath was not followed by -Wl,*" @@ -201,11 +194,9 @@ while [ -n "$1" ]; do # TODO: Handle multiple -Wl, continuations of -Wl,-rpath arg="${arg#-Wl,}" for rpath in ${arg//,/ }; do - echo " RPATH=[$rpath]" >&2 rpaths+=("$rpath") done else - echo "OTHER" >&2 other_args+=("-Wl,$arg") fi ;; |