diff options
| author | Gregory Becker <becker33@llnl.gov> | 2015-11-11 16:33:22 -0800 |
|---|---|---|
| committer | Gregory Becker <becker33@llnl.gov> | 2015-11-11 16:33:22 -0800 |
| commit | 185f40eb8bbc19ecd7e2634844c97067388d0422 (patch) | |
| tree | b2a2056381d911dbfcecf52e18f3f7d7010532fb /lib | |
| parent | 3067705c109aef062823e62f0bb8a9d977a10a35 (diff) | |
| download | spack-185f40eb8bbc19ecd7e2634844c97067388d0422.tar.gz spack-185f40eb8bbc19ecd7e2634844c97067388d0422.tar.bz2 spack-185f40eb8bbc19ecd7e2634844c97067388d0422.tar.xz spack-185f40eb8bbc19ecd7e2634844c97067388d0422.zip | |
fixed my git problems
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/compiler.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/compilers/gcc.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/compilers/intel.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/compilers/pgi.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py index 41ff89a151..abf7223117 100644 --- a/lib/spack/spack/compiler.py +++ b/lib/spack/spack/compiler.py @@ -291,7 +291,7 @@ class Compiler(object): # match = re.findall(r'(%s)/([^\s(]*)' % cls.PrgEnv_compiler, module) for name, version in matches: - v = version + '-craype' + v = version comp = cls(spack.spec.CompilerSpec(name + '@' + v), ['cc', 'CC', 'ftn'], [cls.PrgEnv, name +'/' + v]) diff --git a/lib/spack/spack/compilers/gcc.py b/lib/spack/spack/compilers/gcc.py index ff0b8889a8..a9a4f729eb 100644 --- a/lib/spack/spack/compilers/gcc.py +++ b/lib/spack/spack/compilers/gcc.py @@ -42,7 +42,7 @@ class Gcc(Compiler): # MacPorts builds gcc versions with prefixes and -mp-X.Y suffixes. suffixes = [r'-mp-\d\.\d'] - PrgEnv = 'gnu' + PrgEnv = 'PrgEnv-gnu' PrgEnv_compiler = 'gcc' @property diff --git a/lib/spack/spack/compilers/intel.py b/lib/spack/spack/compilers/intel.py index 7c485fe69d..4096e32a08 100644 --- a/lib/spack/spack/compilers/intel.py +++ b/lib/spack/spack/compilers/intel.py @@ -37,7 +37,7 @@ class Intel(Compiler): # Subclasses use possible names of Fortran 90 compiler fc_names = ['ifort'] - PrgEnv = 'intel' + PrgEnv = 'PrgEnv-intel' PrgEnv_compiler = 'intel' @property diff --git a/lib/spack/spack/compilers/pgi.py b/lib/spack/spack/compilers/pgi.py index 8f1ed28825..8010c1d04d 100644 --- a/lib/spack/spack/compilers/pgi.py +++ b/lib/spack/spack/compilers/pgi.py @@ -37,7 +37,7 @@ class Pgi(Compiler): # Subclasses use possible names of Fortran 90 compiler fc_names = ['pgf95', 'pgf90'] - PrgEnv = 'pgi' + PrgEnv = 'PrgEnv-pgi' PrgEnv_compiler = 'pgi' @classmethod |