diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2021-05-01 15:15:00 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-05-02 22:27:40 +0300 |
| commit | d0325c898ad7f16dc9e22389d365a33097b80af8 (patch) | |
| tree | 8793b3436654f12c56b98ca268df40dfd55f6856 /mesonbuild/compilers/mixins/clike.py | |
| parent | 9bbf2dd07c1adbb3fd129d1fac824c369d3286cf (diff) | |
| download | meson-d0325c898ad7f16dc9e22389d365a33097b80af8.zip meson-d0325c898ad7f16dc9e22389d365a33097b80af8.tar.gz meson-d0325c898ad7f16dc9e22389d365a33097b80af8.tar.bz2 | |
Use sanity_check_impl for objc/objpp
This gets rid of compile warnings, and simplifies the code.
Note that `work_dir` in sanity_check_impl was incorrect,
it was used both to prepend to file names and as cwd=work_dir
argument to Popen. This is fixed here.
Closes gh-7344
Diffstat (limited to 'mesonbuild/compilers/mixins/clike.py')
| -rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index 70dde60..0637439 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -313,7 +313,7 @@ class CLikeCompiler(Compiler): # Compile sanity check # NOTE: extra_flags must be added at the end. On MSVC, it might contain a '/link' argument # after which all further arguments will be passed directly to the linker - cmdlist = self.exelist + [source_name] + self.get_output_args(binary_name) + extra_flags + cmdlist = self.exelist + [sname] + self.get_output_args(binname) + extra_flags pc, stdo, stde = mesonlib.Popen_safe(cmdlist, cwd=work_dir) mlog.debug('Sanity check compiler command line:', ' '.join(cmdlist)) mlog.debug('Sanity check compile stdout:') |