From 0bc77c604ff45a3b1a010aca6e99c9b8770f772f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 6 Aug 2021 15:15:57 -0700 Subject: backends: move method from ninjabackend to base class The baseclass has code that assumes said method exists, and it really doesn't seem to do anything ninja specific, so move it to the generic backend. --- mesonbuild/backend/backends.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'mesonbuild/backend/backends.py') diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 6c877ea..93dfd12 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -789,16 +789,21 @@ class Backend: return pch_rel_to_build @staticmethod - def escape_extra_args(compiler, args): + def escape_extra_args(args: T.List[str]) -> T.List[str]: # all backslashes in defines are doubly-escaped - extra_args = [] + extra_args: T.List[str] = [] for arg in args: - if arg.startswith('-D') or arg.startswith('/D'): + if arg.startswith(('-D', '/D')): arg = arg.replace('\\', '\\\\') extra_args.append(arg) return extra_args + def get_no_stdlib_args(self, target: 'build.BuildTarget', compiler: 'Compiler') -> T.List[str]: + if compiler.language in self.build.stdlibs[target.for_machine]: + return compiler.get_no_stdinc_args() + return [] + def generate_basic_compiler_args(self, target: build.BuildTarget, compiler: 'Compiler', no_warn_args: bool = False) -> 'CompilerArgs': # Create an empty commands list, and start adding arguments from # various sources in the order in which they must override each other -- cgit v1.1