diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-07-12 17:46:58 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-07-19 00:17:29 +0200 |
| commit | d34e53202043abab121ba93fa3922e5b2e4961b8 (patch) | |
| tree | a95a9b867808d92579543ecd2ba3f102d85f39c5 /mesonbuild/backend | |
| parent | b4d313b05876a1af40014a4c3b129fe2db7cafb9 (diff) | |
| download | meson-d34e53202043abab121ba93fa3922e5b2e4961b8.zip meson-d34e53202043abab121ba93fa3922e5b2e4961b8.tar.gz meson-d34e53202043abab121ba93fa3922e5b2e4961b8.tar.bz2 | |
backends: do not split command and arguments in ExecutableSerialisation
This is not needed anymore, just make a single field with the whole
command line.
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/backends.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index a334b34..8c2752a 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -69,9 +69,8 @@ class TargetInstallData: self.optional = optional class ExecutableSerialisation: - def __init__(self, fname, cmd_args, env=None, exe_wrapper=None, + def __init__(self, cmd_args, env=None, exe_wrapper=None, workdir=None, extra_paths=None, capture=None): - self.fname = fname self.cmd_args = cmd_args self.env = env or {} if exe_wrapper is not None: @@ -384,7 +383,7 @@ class Backend: scratch_file = 'meson_exe_{0}_{1}.dat'.format(basename, digest) exe_data = os.path.join(self.environment.get_scratch_dir(), scratch_file) with open(exe_data, 'wb') as f: - es = ExecutableSerialisation(exe_cmd, cmd_args, env, + es = ExecutableSerialisation(exe_cmd + cmd_args, env, exe_wrapper, workdir, extra_paths, capture) pickle.dump(es, f) |