diff options
| author | Christoph Behle <behlec@gmail.com> | 2017-12-16 15:05:09 +0100 |
|---|---|---|
| committer | Christoph Behle <behlec@gmail.com> | 2017-12-16 15:05:09 +0100 |
| commit | 783263b9f4626f7267264e507d55e9fb2ba66943 (patch) | |
| tree | e306caf49d01a988406189272053e74bb36fadb9 /mesonbuild | |
| parent | c6acf75617a8c200f8c8cbe11c3342228842be05 (diff) | |
| download | meson-783263b9f4626f7267264e507d55e9fb2ba66943.zip meson-783263b9f4626f7267264e507d55e9fb2ba66943.tar.gz meson-783263b9f4626f7267264e507d55e9fb2ba66943.tar.bz2 | |
More version information for C#
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/compilers/cs.py | 4 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/compilers/cs.py b/mesonbuild/compilers/cs.py index b8a4d13..dd7a433 100644 --- a/mesonbuild/compilers/cs.py +++ b/mesonbuild/compilers/cs.py @@ -19,9 +19,9 @@ from ..mesonlib import EnvironmentException from .compilers import Compiler, mono_buildtype_args class MonoCompiler(Compiler): - def __init__(self, exelist, version): + def __init__(self, exelist, version, **kwargs): self.language = 'cs' - super().__init__(exelist, version) + super().__init__(exelist, version, **kwargs) self.id = 'mono' self.monorunner = 'mono' diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 1d1cb82..8597cf0 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -666,8 +666,9 @@ class Environment: except OSError: raise EnvironmentException('Could not execute C# compiler "%s"' % ' '.join(exelist)) version = search_version(out) + full_version = out.split('\n', 1)[0] if 'Mono' in out: - return MonoCompiler(exelist, version) + return MonoCompiler(exelist, version, full_version=full_version) raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"') def detect_vala_compiler(self): |