diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-26 23:42:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-26 23:42:23 +0300 |
| commit | 1cd037b578a7d4b731d28728bceb8eed4f633ce5 (patch) | |
| tree | 0b6deefd00c80cfb2cab4e46bb7beed2faf6f6a8 /mesonbuild/backend/ninjabackend.py | |
| parent | a415fafe5666b8d55421bca55b416e6b2ec0d3a7 (diff) | |
| parent | aac58f185b19902e08ec63ba976f461796b3df0b (diff) | |
| download | meson-1cd037b578a7d4b731d28728bceb8eed4f633ce5.zip meson-1cd037b578a7d4b731d28728bceb8eed4f633ce5.tar.gz meson-1cd037b578a7d4b731d28728bceb8eed4f633ce5.tar.bz2 | |
Merge pull request #2248 from thiblahute/csharp
Make cs_args a known argument and handle c# external dependencies
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 1f6a80b..dce3b80 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -967,7 +967,7 @@ int dummy; compiler = target.compilers['cs'] rel_srcs = [s.rel_to_builddir(self.build_to_src) for s in src_list] deps = [] - commands = target.extra_args.get('cs', []) + commands = CompilerArgs(compiler, target.extra_args.get('cs', [])) commands += compiler.get_buildtype_args(buildtype) if isinstance(target, build.Executable): commands.append('-target:exe') @@ -994,6 +994,11 @@ int dummy; rel_srcs.append(rel_src) deps.append(rel_src) + for dep in target.get_external_deps(): + commands.extend_direct(dep.get_link_args()) + commands += self.build.get_project_args(compiler, target.subproject) + commands += self.build.get_global_args(compiler) + elem = NinjaBuildElement(self.all_outputs, outputs, 'cs_COMPILER', rel_srcs) elem.add_dep(deps) elem.add_item('ARGS', commands) |