diff options
| author | Gregory Becker <becker33@llnl.gov> | 2016-03-02 14:17:46 -0800 |
|---|---|---|
| committer | Gregory Becker <becker33@llnl.gov> | 2016-03-02 14:17:46 -0800 |
| commit | 676591ffc0d62a4d3b20653a2faa788c06d96d77 (patch) | |
| tree | 614812061203422b8c26edaaed40a18648e411d2 | |
| parent | e46bac19fa9baafe1e4b32ff940a883218f8b019 (diff) | |
| download | spack-676591ffc0d62a4d3b20653a2faa788c06d96d77.tar.gz spack-676591ffc0d62a4d3b20653a2faa788c06d96d77.tar.bz2 spack-676591ffc0d62a4d3b20653a2faa788c06d96d77.tar.xz spack-676591ffc0d62a4d3b20653a2faa788c06d96d77.zip | |
fixed a bug and a test bug
| -rw-r--r-- | lib/spack/spack/spec.py | 2 | ||||
| -rw-r--r-- | var/spack/mock_configs/site_spackconfig/compilers.yaml | 23 |
2 files changed, 19 insertions, 6 deletions
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 6cca61ca4e..6d2138d4c8 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -1307,7 +1307,7 @@ class Spec(object): if not self.compiler.satisfies(other.compiler, strict=strict): return False elif strict and (other.compiler and not self.compiler): - return True + return False if not self.variants.satisfies(other.variants, strict=strict): return False diff --git a/var/spack/mock_configs/site_spackconfig/compilers.yaml b/var/spack/mock_configs/site_spackconfig/compilers.yaml index fcbf7a53f1..72fa252881 100644 --- a/var/spack/mock_configs/site_spackconfig/compilers.yaml +++ b/var/spack/mock_configs/site_spackconfig/compilers.yaml @@ -13,10 +13,23 @@ compilers: fc: /path/to/gfortran modules: None gcc@5.2.0: - cc: cc - cxx: CC - f77: ftn - fc: ftn - modules: + cc: cc + cxx: CC + f77: ftn + fc: ftn + modules: - PrgEnv-gnu - gcc/5.2.0 + intel@15.0.1: + cc: cc + ccx: CC + f77: ftn + fc: ftn + modules: + - PrgEnv-intel + - intel/15.0.1 + intel@15.1.2: + cc: /path/to/icc + cxx: /path/to/ic++ + f77: /path/to/ifort + fc: /path/to/ifort |