fixed my git problems

lib/spack/spack/compiler.py

@@ -291,7 +291,7 @@ def find_in_modules(cls):
 #                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])
 

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

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

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