ADD: pgi@18.5 compiler

env/merlin/all/spack.yaml

@@ -571,7 +571,7 @@ spack:
   - matrix:
     - [relion +cuda cuda_arch=61]
     - ['%pgi']
-    - [ctffing%gcc]
+    - [^ctffing%gcc]
     - [^openmpi%pgi]
     - [^openblas]
     - [^llvm%gcc@8.3.0]

env/merlin/all/sysconfigs/compilers.yaml

@@ -90,4 +90,17 @@ compilers:
         f77: /opt/psi/Programming/pgi/21.5/Linux_x86_64/21.5/compilers/bin/nvfortran
         fc: /opt/psi/Programming/pgi/21.5/Linux_x86_64/21.5/compilers/bin/nvfortran
       spec: nvhpc@21.5
+      target: x86_64
+  - compiler:
+      environment: {}
+      extra_rpaths: []
+      flags: {}
+      modules: [pgi/18.5]
+      operating_system: rhel7
+      paths:
+        cc: /opt/psi/Programming/pgi/18.5/linux86-64/18.5/bin/pgcc
+        cxx: /opt/psi/Programming/pgi/18.5/linux86-64/18.5/bin/pgc++
+        f77: /opt/psi/Programming/pgi/18.5/linux86-64/18.5/bin/pgfortran
+        fc: /opt/psi/Programming/pgi/18.5/linux86-64/18.5/bin/pgfortran
+      spec: pgi@18.5
       target: x86_64