diff options
| author | makise-homura <akemi_homura@kurisa.ch> | 2020-01-23 23:45:41 +0300 |
|---|---|---|
| committer | makise-homura <akemi_homura@kurisa.ch> | 2020-01-27 22:37:21 +0300 |
| commit | ee6c2c87fc238e673c609ad7200bd0aa66af03b4 (patch) | |
| tree | f3609061b219c6e41f4ce7a6a4509891606a02b5 /mesonbuild/environment.py | |
| parent | c910ad4b8f81505e4aba4dd786512ddd9b6ef27f (diff) | |
| download | meson-ee6c2c87fc238e673c609ad7200bd0aa66af03b4.zip meson-ee6c2c87fc238e673c609ad7200bd0aa66af03b4.tar.gz meson-ee6c2c87fc238e673c609ad7200bd0aa66af03b4.tar.bz2 | |
Bringing back defines in Elbrus C compiler to simplify environment.py
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 7dd0d29..ef9480b 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -948,16 +948,10 @@ class Environment: linker = self._guess_nix_linker(compiler, cls, for_machine) - 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) + 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 |