summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/spack/spack/build_systems/intel.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py
index 152e5eec16..36e0b966d1 100644
--- a/lib/spack/spack/build_systems/intel.py
+++ b/lib/spack/spack/build_systems/intel.py
@@ -964,7 +964,8 @@ class IntelPackage(PackageBase):
root=self.component_lib_dir('mpi'),
shared=True, recursive=True) + result
- if '+mkl' in self.spec or self.provides('scalapack'):
+ if '^mpi' in self.spec.root and ('+mkl' in self.spec or
+ self.provides('scalapack')):
result = self.scalapack_libs + result
debug_print(result)
@@ -1199,6 +1200,9 @@ class IntelPackage(PackageBase):
install_script = Executable('./install.sh')
install_script.add_default_env('TMPDIR', tmpdir)
+ # Need to set HOME to avoid using ~/intel
+ install_script.add_default_env('HOME', prefix)
+
# perform
install_script('--silent', 'silent.cfg')