diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-09-29 13:53:04 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-10-01 15:06:10 -0700 |
| commit | ff51e1c5aa08e34324129ab0f7bdbf8a28a4f95f (patch) | |
| tree | 05521e4607626c0d3c8ae0bfaabfe8ef163d1842 /mesonbuild/compilers | |
| parent | 135f5d5838263e2afd344d916710071037ffcadc (diff) | |
| download | meson-ff51e1c5aa08e34324129ab0f7bdbf8a28a4f95f.zip meson-ff51e1c5aa08e34324129ab0f7bdbf8a28a4f95f.tar.gz meson-ff51e1c5aa08e34324129ab0f7bdbf8a28a4f95f.tar.bz2 | |
compilers/clike: Store exe_wrapper as ExternalProgram
Which is what other languages do.
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/fortran.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index 6cbd2ce..1714fab 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -88,7 +88,7 @@ class FortranCompiler(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 + [str(binary_name)] + cmdlist = self.exe_wrapper.get_command() + [str(binary_name)] else: cmdlist = [str(binary_name)] # %% Run the test executable 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: |