diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-04-29 21:00:40 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-05-05 21:58:08 +0300 |
| commit | 541f2ce535b88ee5c658aa4054aa3eb3fcf42342 (patch) | |
| tree | 2b5d2208561b3d1b60725ddd9fea937135e6e2f6 /mesonbuild/compilers/c.py | |
| parent | a0cf7ad3d8fbafacb7146488d8e56c301646aa92 (diff) | |
| download | meson-revert5323.zip meson-revert5323.tar.gz meson-revert5323.tar.bz2 | |
Revert "Merge pull request #5323 from scivision/pgiflang"revert5323
This reverts commit 9cd89f55fca0933dd2897ac7470c5827d939e0ac, reversing
changes made to 60969d99d33001317c569a9b37d3b9efae08d387.
Diffstat (limited to 'mesonbuild/compilers/c.py')
| -rw-r--r-- | mesonbuild/compilers/c.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 1aeb637..07d18d8 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -1331,9 +1331,9 @@ class GnuCCompiler(GnuCompiler, CCompiler): class PGICCompiler(PGICompiler, CCompiler): - def __init__(self, exelist, version, compiler_type, is_cross, exe_wrapper=None, **kwargs): + def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwargs): CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs) - PGICompiler.__init__(self, compiler_type) + PGICompiler.__init__(self, CompilerType.PGI_STANDARD) class ElbrusCCompiler(GnuCCompiler, ElbrusCompiler): @@ -1729,12 +1729,6 @@ 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) |