Merge pull request #5323 from scivision/pgiflang

Windows compiler fixes: PGI, Intel

1 files changed, 8 insertions, 2 deletions

diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 94ef336..54ca894 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -1324,9 +1324,9 @@ class GnuCCompiler(GnuCompiler, CCompiler):
 
 
 class PGICCompiler(PGICompiler, CCompiler):
-    def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwargs):
+    def __init__(self, exelist, version, compiler_type, is_cross, exe_wrapper=None, **kwargs):
         CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)
-        PGICompiler.__init__(self, CompilerType.PGI_STANDARD)
+        PGICompiler.__init__(self, compiler_type)
 
 
 class ElbrusCCompiler(GnuCCompiler, ElbrusCompiler):
@@ -1722,6 +1722,12 @@ class ClangClCCompiler(VisualStudioCCompiler):
         self.id = 'clang-cl'
 
 
+class IntelClCCompiler(VisualStudioCCompiler):
+    def __init__(self, exelist, version, is_cross, exe_wrap, target):
+        super().__init__(exelist, version, is_cross, exe_wrap, target)
+        self.id = 'intel'
+
+
 class ArmCCompiler(ArmCompiler, CCompiler):
     def __init__(self, exelist, version, compiler_type, is_cross, exe_wrapper=None, **kwargs):
         CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)