diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-04-05 11:10:40 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2018-04-16 19:11:16 -0400 |
| commit | bca2ff6def2db24824ad3d7452cb4c78519560d7 (patch) | |
| tree | 5fd712a93b8022c14bc8d068a9e7c81ad6463c36 /mesonbuild/compilers/cpp.py | |
| parent | 3d91a08bbcbf5eed204dc7ad4b1f7ab019390347 (diff) | |
| download | meson-bca2ff6def2db24824ad3d7452cb4c78519560d7.zip meson-bca2ff6def2db24824ad3d7452cb4c78519560d7.tar.gz meson-bca2ff6def2db24824ad3d7452cb4c78519560d7.tar.bz2 | |
VisualStudioCPPCompiler: Fix -fpermissive still being added
super(VisualStudioCCompiler, self) calls CPPCompiler and that's what we
want to avoid.
Diffstat (limited to 'mesonbuild/compilers/cpp.py')
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 8dd2306..238c6de 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -212,7 +212,7 @@ are likely to be wrong regardless of the compiler you are using. class VisualStudioCPPCompiler(VisualStudioCCompiler, CPPCompiler): def __init__(self, exelist, version, is_cross, exe_wrap, is_64): - self.language = 'cpp' + CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap) VisualStudioCCompiler.__init__(self, exelist, version, is_cross, exe_wrap, is_64) self.base_options = ['b_pch'] # FIXME add lto, pgo and the like @@ -239,7 +239,7 @@ class VisualStudioCPPCompiler(VisualStudioCCompiler, CPPCompiler): def get_compiler_check_args(self): # Visual Studio C++ compiler doesn't support -fpermissive, # so just use the plain C args. - return super(VisualStudioCCompiler, self).get_compiler_check_args() + return VisualStudioCCompiler.get_compiler_check_args(self) class ArmCPPCompiler(ArmCompiler, CPPCompiler): |