aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/c.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-01-28 09:58:08 -0800
committerGitHub <noreply@github.com>2020-01-28 09:58:08 -0800
commit3d60665885132cceccc7d80640a5b4735d6a7d48 (patch)
treee284a49e9c2b66c31d8dffede7db4703f2aafb4a /mesonbuild/compilers/c.py
parent0fe485a100ee556bf1d600e6bb87640641b67a76 (diff)
parentee6c2c87fc238e673c609ad7200bd0aa66af03b4 (diff)
downloadmeson-3d60665885132cceccc7d80640a5b4735d6a7d48.zip
meson-3d60665885132cceccc7d80640a5b4735d6a7d48.tar.gz
meson-3d60665885132cceccc7d80640a5b4735d6a7d48.tar.bz2
Merge pull request #6455 from makise-homura/elbrus_0.53.0
Elbrus support is broken in 0.53.0, so fixing it
Diffstat (limited to 'mesonbuild/compilers/c.py')
-rw-r--r--mesonbuild/compilers/c.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index d9d81d6..4647562 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -231,10 +231,11 @@ class PGICCompiler(PGICompiler, CCompiler):
class ElbrusCCompiler(GnuCCompiler, ElbrusCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice,
- is_cross, info: 'MachineInfo', exe_wrapper=None, defines=None, **kwargs):
+ is_cross, info: 'MachineInfo', exe_wrapper=None,
+ defines=None, **kwargs):
GnuCCompiler.__init__(self, exelist, version, for_machine, is_cross,
info, exe_wrapper, defines, **kwargs)
- ElbrusCompiler.__init__(self, defines)
+ ElbrusCompiler.__init__(self)
# It does support some various ISO standards and c/gnu 90, 9x, 1x in addition to those which GNU CC supports.
def get_options(self):