diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-09-29 19:28:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 19:28:51 +0300 |
| commit | 400ec2d6857ba72147a3d9389777ec64e12fe67e (patch) | |
| tree | 933d2de6c8759f755669e65a6a93c61f712cf399 /mesonbuild/backend/vs2010backend.py | |
| parent | d1638a4fde5be879fe7778200b6ae6d59106a25e (diff) | |
| parent | bd16b4846f3d49725cee5b750162270d1de79388 (diff) | |
| download | meson-400ec2d6857ba72147a3d9389777ec64e12fe67e.zip meson-400ec2d6857ba72147a3d9389777ec64e12fe67e.tar.gz meson-400ec2d6857ba72147a3d9389777ec64e12fe67e.tar.bz2 | |
Merge pull request #7762 from jon-turney/meson-exe-output-improve
Improve the output for meson wrapped commands
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index ab2cafd..021a1da 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -150,7 +150,7 @@ class Vs2010Backend(backends.Backend): # Always use a wrapper because MSBuild eats random characters when # 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( + cmd, _ = self.as_meson_exe_cmdline( 'generator ' + cmd[0], cmd[0], cmd[1:], @@ -567,12 +567,12 @@ 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:], - # All targets run from the target dir - workdir=tdir_abs, - extra_bdeps=extra_bdeps, - capture=ofilenames[0] if target.capture else None, - force_serialize=True) + wrapper_cmd, _ = self.as_meson_exe_cmdline(target.name, target.command[0], cmd[1:], + # All targets run from the target dir + workdir=tdir_abs, + extra_bdeps=extra_bdeps, + capture=ofilenames[0] if target.capture else None, + force_serialize=True) if target.build_always_stale: # Use a nonexistent file to always consider the target out-of-date. ofilenames += [self.nonexistent_file(os.path.join(self.environment.get_scratch_dir(), |