diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-07-04 19:18:28 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-07-05 17:55:04 +0300 |
| commit | bd6f46e723813dfadaba1f7c87d3b0b751d05219 (patch) | |
| tree | 4e5114bd99e249f474023c505b8c388c73bde255 /mesonbuild/compilers | |
| parent | b4b488f33cb6da1d840371039d6cf2c76f91ea9b (diff) | |
| download | meson-bd6f46e723813dfadaba1f7c87d3b0b751d05219.zip meson-bd6f46e723813dfadaba1f7c87d3b0b751d05219.tar.gz meson-bd6f46e723813dfadaba1f7c87d3b0b751d05219.tar.bz2 | |
condense lines
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/detect.py | 3 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/gnu.py | 3 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/islinker.py | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py index 78a4be8..cd0f252 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py @@ -548,8 +548,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin if version != 'unknown version': break else: - m = f'Failed to detect MSVC compiler version: stderr was\n{err!r}' - raise EnvironmentException(m) + raise EnvironmentException(f'Failed to detect MSVC compiler version: stderr was\n{err!r}') cl_signature = lookat.split('\n')[0] match = re.search(r'.*(x86|x64|ARM|ARM64)([^_A-Za-z0-9]|$)', cl_signature) if match: diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py index a4e73d2..5d915f3 100644 --- a/mesonbuild/compilers/mixins/gnu.py +++ b/mesonbuild/compilers/mixins/gnu.py @@ -316,8 +316,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta): def use_linker_args(cls, linker: str) -> T.List[str]: if linker not in {'gold', 'bfd', 'lld'}: raise mesonlib.MesonException( - 'Unsupported linker, only bfd, gold, and lld are supported, ' - f'not {linker}.') + 'Unsupported linker, only bfd, gold, and lld are supported, not {linker}.') return [f'-fuse-ld={linker}'] def get_coverage_args(self) -> T.List[str]: diff --git a/mesonbuild/compilers/mixins/islinker.py b/mesonbuild/compilers/mixins/islinker.py index 250d55b..4c29f8c 100644 --- a/mesonbuild/compilers/mixins/islinker.py +++ b/mesonbuild/compilers/mixins/islinker.py @@ -82,16 +82,13 @@ class BasicLinkerIsCompilerMixin(Compiler): return self.get_std_shared_lib_link_args() def get_link_whole_for(self, args: T.List[str]) -> T.List[str]: - raise EnvironmentException( - f'Linker {self.id} does not support link_whole') + raise EnvironmentException(f'Linker {self.id} does not support link_whole') def get_allow_undefined_link_args(self) -> T.List[str]: - raise EnvironmentException( - f'Linker {self.id} does not support allow undefined') + raise EnvironmentException(f'Linker {self.id} does not support allow undefined') def get_pie_link_args(self) -> T.List[str]: - m = f'Linker {self.id} does not support position-independent executable' - raise EnvironmentException(m) + raise EnvironmentException(f'Linker {self.id} does not support position-independent executable') def get_undefined_link_args(self) -> T.List[str]: return [] |