From 7321cc776afb313326e6cb1596527ef04af9aedb Mon Sep 17 00:00:00 2001 From: makise-homura Date: Mon, 13 Jan 2020 17:11:20 +0300 Subject: Fix missing 'defines' argumet for Elbrus compiler ...But somehow it still remains in C++ compiler. --- mesonbuild/environment.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'mesonbuild/environment.py') diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 58c9e99..da670f3 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -939,10 +939,17 @@ class Environment: cls = GnuCCompiler if lang == 'c' else GnuCPPCompiler linker = self._guess_nix_linker(compiler, cls, for_machine) - return cls( - ccache + compiler, version, for_machine, is_cross, - info, exe_wrap, defines, full_version=full_version, - linker=linker) + + if lang == 'c': # There's no 'defines' anymore in C Compiler classes. + return cls( + ccache + compiler, version, for_machine, is_cross, + info, exe_wrap, full_version=full_version, + linker=linker) + else: + return cls( + ccache + compiler, version, for_machine, is_cross, + info, exe_wrap, defines, full_version=full_version, + linker=linker) if 'Emscripten' in out: cls = EmscriptenCCompiler if lang == 'c' else EmscriptenCPPCompiler -- cgit v1.1