diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/backends.py | 2 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 7 | ||||
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 5 | ||||
| -rw-r--r-- | mesonbuild/backend/xcodebackend.py | 3 |
4 files changed, 7 insertions, 10 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 93dfd12..19b94d8 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -500,7 +500,7 @@ class Backend: exe_wrapper, workdir, extra_paths, capture, feed, tag) - def as_meson_exe_cmdline(self, tname, exe, cmd_args, workdir=None, + def as_meson_exe_cmdline(self, exe, cmd_args, workdir=None, extra_bdeps=None, capture=None, feed=None, force_serialize=False, env: T.Optional[build.EnvironmentVariables] = None, diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 46ad450..66844ef 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -984,7 +984,7 @@ class NinjaBackend(backends.Backend): for output in d.get_outputs(): elem.add_dep(os.path.join(self.get_target_dir(d), output)) - cmd, reason = self.as_meson_exe_cmdline(target.name, target.command[0], cmd[1:], + cmd, reason = self.as_meson_exe_cmdline(target.command[0], cmd[1:], extra_bdeps=target.get_transitive_build_target_deps(), capture=ofilenames[0] if target.capture else None, feed=srcs[0] if target.feed else None, @@ -1022,7 +1022,7 @@ class NinjaBackend(backends.Backend): else: target_env = self.get_run_target_env(target) _, _, cmd = self.eval_custom_target_command(target) - meson_exe_cmd, reason = self.as_meson_exe_cmdline(target_name, target.command[0], cmd[1:], + meson_exe_cmd, reason = self.as_meson_exe_cmdline(target.command[0], cmd[1:], force_serialize=True, env=target_env, verbose=True) cmd_type = f' (wrapped by meson {reason})' @@ -2218,8 +2218,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) outfilelist = outfilelist[len(generator.outputs):] args = self.replace_paths(target, args, override_subdir=subdir) cmdlist = exe_arr + self.replace_extra_args(args, genlist) - cmdlist, reason = self.as_meson_exe_cmdline('generator ' + cmdlist[0], - cmdlist[0], cmdlist[1:], + cmdlist, reason = self.as_meson_exe_cmdline(cmdlist[0], cmdlist[1:], capture=outfiles[0] if generator.capture else None) abs_pdir = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target)) os.makedirs(abs_pdir, exist_ok=True) diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index fa544ef..0a6e7cd 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -150,7 +150,6 @@ class Vs2010Backend(backends.Backend): # there are many arguments. tdir_abs = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target)) cmd, _ = self.as_meson_exe_cmdline( - 'generator ' + cmd[0], cmd[0], cmd[1:], workdir=tdir_abs, @@ -560,7 +559,7 @@ class Vs2010Backend(backends.Backend): _, _, cmd_raw = self.eval_custom_target_command(target) depend_files = self.get_custom_target_depend_files(target) target_env = self.get_run_target_env(target) - wrapper_cmd, _ = self.as_meson_exe_cmdline(target.name, target.command[0], cmd_raw[1:], + wrapper_cmd, _ = self.as_meson_exe_cmdline(target.command[0], cmd_raw[1:], force_serialize=True, env=target_env, verbose=True) self.add_custom_build(root, 'run_target', ' '.join(self.quote_arguments(wrapper_cmd)), @@ -581,7 +580,7 @@ class Vs2010Backend(backends.Backend): # there are many arguments. tdir_abs = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target)) extra_bdeps = target.get_transitive_build_target_deps() - wrapper_cmd, _ = self.as_meson_exe_cmdline(target.name, target.command[0], cmd[1:], + wrapper_cmd, _ = self.as_meson_exe_cmdline(target.command[0], cmd[1:], # All targets run from the target dir workdir=tdir_abs, extra_bdeps=extra_bdeps, diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index c67828f..2f21149 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -1169,8 +1169,7 @@ class XCodeBackend(backends.Backend): if not isinstance(t, build.CustomTarget): continue (srcs, ofilenames, cmd) = self.eval_custom_target_command(t, absolute_outputs=True) - fixed_cmd, _ = self.as_meson_exe_cmdline(t.name, - cmd[0], + fixed_cmd, _ = self.as_meson_exe_cmdline(cmd[0], cmd[1:], #workdir=None, env=t.env) |