diff options
| author | Gregory Becker <becker33@llnl.gov> | 2016-03-02 16:33:10 -0800 |
|---|---|---|
| committer | Gregory Becker <becker33@llnl.gov> | 2016-03-02 16:33:10 -0800 |
| commit | 487b2495a1dbda730a6525f17f175f3eff1674c0 (patch) | |
| tree | 11f0be2b2fdfef0c89ee4eba238f0bbcd61d9e89 /lib | |
| parent | 2b487287419528142b16d9e4201a44a034c11d20 (diff) | |
| download | spack-487b2495a1dbda730a6525f17f175f3eff1674c0.tar.gz spack-487b2495a1dbda730a6525f17f175f3eff1674c0.tar.bz2 spack-487b2495a1dbda730a6525f17f175f3eff1674c0.tar.xz spack-487b2495a1dbda730a6525f17f175f3eff1674c0.zip | |
made spack more conservative in compiler strategies attempted
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/compiler.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py index 5d851f5a3d..999984740f 100644 --- a/lib/spack/spack/compiler.py +++ b/lib/spack/spack/compiler.py @@ -34,6 +34,7 @@ from llnl.util.filesystem import join_path import spack.error import spack.spec +import spack.architecture from spack.util.multiproc import parmap from spack.util.executable import * from spack.util.environment import get_path @@ -221,7 +222,15 @@ class Compiler(object): @classmethod def find(cls, *path): - return cls.find_in_path(*path) + cls.find_in_modules() + compilers = [] + platform = spack.architecture.sys_type() + strategies = [o.compiler_strategy for o in platform.operating_systems.values()] + if 'PATH' in strategies: + compilers.extend(cls.find_in_path(*path)) + if 'MODULES' in strategies: + compilers.extend(cls.find_in_modules()) + return compilers + @classmethod def find_in_path(cls, *path): |