restore PGI compile functioning

2 files changed, 28 insertions, 13 deletions

diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 3ef4ffc..34c0e3b 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1309,6 +1309,8 @@ class CompilerType(enum.Enum):
 
     CCRX_WIN = 40
 
+    PGI_STANDARD = 50
+
     @property
     def is_standard_compiler(self):
         return self.name in ('GCC_STANDARD', 'CLANG_STANDARD', 'ICC_STANDARD')
@@ -1598,6 +1600,25 @@ class GnuCompiler(GnuLikeCompiler):
         return ['-fopenmp']
 
 
+class PGICompiler:
+    def __init__(self, compiler_type):
+        self.id = 'pgi'
+        self.compiler_type = compiler_type
+
+        default_warn_args = ['-Minform=inform']
+        self.warn_args = {'1': default_warn_args,
+                          '2': default_warn_args,
+                          '3': default_warn_args}
+
+        def get_module_incdir_args(self):
+            return ('-module', )
+
+        def get_no_warn_args(self):
+            return ['-silent']
+
+        def openmp_flags(self):
+            return ['-fopenmp']
+
 class ElbrusCompiler(GnuCompiler):
     # Elbrus compiler is nearly like GCC, but does not support
     # PCH, LTO, sanitizers and color output as of version 1.21.x.
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
index 8056969..2eb4c71 100644
--- a/mesonbuild/compilers/fortran.py
+++ b/mesonbuild/compilers/fortran.py
@@ -24,6 +24,7 @@ from .compilers import (
     GnuCompiler,
     ElbrusCompiler,
     IntelCompiler,
+    PGICompiler
 )
 
 from mesonbuild.mesonlib import EnvironmentException, is_osx
@@ -372,20 +373,13 @@ class PathScaleFortranCompiler(FortranCompiler):
 class PGIFortranCompiler(FortranCompiler):
     def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags):
         FortranCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwags)
-        self.id = 'pgi'
-        default_warn_args = ['-Minform=inform']
-        self.warn_args = {'1': default_warn_args,
-                          '2': default_warn_args,
-                          '3': default_warn_args}
-
-    def get_module_incdir_args(self):
-        return ('-module', )
-
-    def get_no_warn_args(self):
-        return ['-silent']
+        PGICompiler.__init__(self, CompilerType.PGI_STANDARD)
 
-    def openmp_flags(self):
-        return ['-fopenmp']
+    def get_always_args(self):
+        """PGI doesn't have -pipe."""
+        val = super().get_always_args()
+        val.remove('-pipe')
+        return val
 
 
 class Open64FortranCompiler(FortranCompiler):