From b6037c65fce3bdbaeef58657993bc326298d4b9b Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 27 Jul 2022 00:38:54 -0400 Subject: linkers: better reporting of command failures Use join_args to ensure that commands are rendered correctly and with less code. --- mesonbuild/linkers/detect.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py index 31f6ddc74..6248ac940 100644 --- a/mesonbuild/linkers/detect.py +++ b/mesonbuild/linkers/detect.py @@ -16,7 +16,7 @@ from __future__ import annotations from ..mesonlib import ( EnvironmentException, OptionKey, - Popen_safe, search_version + Popen_safe, join_args, search_version ) from .linkers import ( AppleDynamicLinker, @@ -51,8 +51,8 @@ defaults['gcc_static_linker'] = ['gcc-ar'] defaults['clang_static_linker'] = ['llvm-ar'] def __failed_to_detect_linker(compiler: T.List[str], args: T.List[str], stdout: str, stderr: str) -> 'T.NoReturn': - msg = 'Unable to detect linker for compiler "{} {}"\nstdout: {}\nstderr: {}'.format( - ' '.join(compiler), ' '.join(args), stdout, stderr) + msg = 'Unable to detect linker for compiler `{}`\nstdout: {}\nstderr: {}'.format( + join_args(compiler + args), stdout, stderr) raise EnvironmentException(msg) -- cgit v1.2.3