Merge branch 'develop' into features/cflags

2016-05-05 10:49:15 -07:00
parent 4ba73dac34 407920e40a
commit 9fb1a9537d
78 changed files with 1592 additions and 471 deletions
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -166,7 +166,7 @@ fi
 # It doesn't work with -rpath.
 # This variable controls whether they are added.
 add_rpaths=true
-if [[ mode == ld && $OSTYPE == darwin* ]]; then
+if [[ $mode == ld && "$SPACK_SHORT_SPEC" =~ "darwin" ]]; then
    for arg in "$@"; do
        if [[ $arg == -r ]]; then
            add_rpaths=false