From ff51e1c5aa08e34324129ab0f7bdbf8a28a4f95f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 29 Sep 2020 13:53:04 -0700 Subject: compilers/clike: Store exe_wrapper as ExternalProgram Which is what other languages do. --- mesonbuild/compilers/mixins/clike.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mesonbuild/compilers/mixins/clike.py') diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index c7e76d7..dca09ea 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -140,7 +140,7 @@ class CLikeCompiler(Compiler): if not exe_wrapper or not exe_wrapper.found() or not exe_wrapper.get_command(): self.exe_wrapper = None else: - self.exe_wrapper = exe_wrapper.get_command() + self.exe_wrapper = exe_wrapper def compiler_args(self, args: T.Optional[T.Iterable[str]] = None) -> CLikeCompilerArgs: # This is correct, mypy just doesn't understand co-operative inheritance @@ -326,7 +326,7 @@ class CLikeCompiler(Compiler): if self.exe_wrapper is None: # Can't check if the binaries run so we have to assume they do return - cmdlist = self.exe_wrapper + [binary_name] + cmdlist = self.exe_wrapper.get_command() + [binary_name] else: cmdlist = [binary_name] mlog.debug('Running test binary command: ' + ' '.join(cmdlist)) @@ -476,7 +476,7 @@ class CLikeCompiler(Compiler): p.returncode)) return compilers.RunResult(False) if need_exe_wrapper: - cmdlist = self.exe_wrapper + [p.output_name] + cmdlist = self.exe_wrapper.get_command() + [p.output_name] else: cmdlist = [p.output_name] try: -- cgit v1.1