diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 7 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 1 |
2 files changed, 7 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) diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index a845eff..313f430 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1238,6 +1238,7 @@ lang_arg_kwargs = set(['c_args', 'objcpp_args', 'rust_args', 'vala_args', + 'cs_args', ]) vala_kwargs = set(['vala_header', 'vala_gir', 'vala_vapi']) |