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/scripts | |
| 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/scripts')
| -rw-r--r-- | mesonbuild/scripts/meson_exe.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py index df54b47..50ad2f5 100644 --- a/mesonbuild/scripts/meson_exe.py +++ b/mesonbuild/scripts/meson_exe.py @@ -55,9 +55,12 @@ def run_exe(exe: ExecutableSerialisation) -> int: stderr=subprocess.PIPE) stdout, stderr = p.communicate() + if exe.pickled and p.returncode != 0: + print('while executing {!r}'.format(cmd_args)) + if p.returncode == 0xc0000135: # STATUS_DLL_NOT_FOUND on Windows indicating a common problem that is otherwise hard to diagnose - raise FileNotFoundError('Missing DLLs on calling {!r}'.format(cmd_args)) + raise FileNotFoundError('due to missing DLLs') if exe.capture and p.returncode == 0: skip_write = False @@ -90,6 +93,7 @@ def run(args: T.List[str]) -> int: parser.error('no other arguments can be used with --unpickle') with open(options.unpickle, 'rb') as f: exe = pickle.load(f) + exe.pickled = True else: exe = ExecutableSerialisation(cmd_args, capture=options.capture) |