diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2016-03-10 09:47:59 -0800 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-03-10 09:47:59 -0800 |
commit | caf6dc0f05771465c2ae9f91b0a8cfa88e6faf06 (patch) | |
tree | 095ceaa7bdc8c4f6d230b4a019b1d1f29f780fe3 /lib | |
parent | ad6625456e02aedd0bf7c3ec707a01ad252414d7 (diff) | |
parent | 30adc4c9b8cdbe099ebe4ef9bec4b2594cda7b61 (diff) | |
download | spack-caf6dc0f05771465c2ae9f91b0a8cfa88e6faf06.tar.gz spack-caf6dc0f05771465c2ae9f91b0a8cfa88e6faf06.tar.bz2 spack-caf6dc0f05771465c2ae9f91b0a8cfa88e6faf06.tar.xz spack-caf6dc0f05771465c2ae9f91b0a8cfa88e6faf06.zip |
Merge pull request #451 from epfl-scitas/fixes/intel_openmpi
Fix : OpenMPI with Intel compiler (and similar issues)
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/spack/env/cc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/lib/spack/env/cc b/lib/spack/env/cc index a19346ce97..4a3e6eddc9 100755 --- a/lib/spack/env/cc +++ b/lib/spack/env/cc @@ -113,14 +113,22 @@ case "$command" in ;; esac -# Finish setting up the mode. +# If any of the arguments below is present then the mode is vcheck. In vcheck mode nothing is added in terms of extra search paths or libraries if [ -z "$mode" ]; then - mode=ccld for arg in "$@"; do if [ "$arg" = -v -o "$arg" = -V -o "$arg" = --version -o "$arg" = -dumpversion ]; then mode=vcheck break - elif [ "$arg" = -E ]; then + fi + done +fi + +# Finish setting up the mode. + +if [ -z "$mode" ]; then + mode=ccld + for arg in "$@"; do + if [ "$arg" = -E ]; then mode=cpp break elif [ "$arg" = -c ]; then @@ -145,6 +153,10 @@ fi # Save original command for debug logging input_command="$@" +if [ "$mode" == vcheck ] ; then + exec ${command} "$@" +fi + # # Now do real parsing of the command line args, trying hard to keep # non-rpath linker arguments in the proper order w.r.t. other command |