diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-07-31 19:33:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 19:33:06 +0300 |
| commit | e75f6e43050594c77a09eb7b27ee3ec0b0d0898f (patch) | |
| tree | e89968d5d63109721a11cb385b77d2f7d69a232c /mesonbuild/compilers/c.py | |
| parent | a5d0a501fd27a7a68675f5ca6b371ee3c0234016 (diff) | |
| parent | e8dae2b966498207867cb07d58f4404b76c087ce (diff) | |
| download | meson-e75f6e43050594c77a09eb7b27ee3ec0b0d0898f.zip meson-e75f6e43050594c77a09eb7b27ee3ec0b0d0898f.tar.gz meson-e75f6e43050594c77a09eb7b27ee3ec0b0d0898f.tar.bz2 | |
Merge pull request #3850 from mesonbuild/nirbheek/exe-wrapper-compiler-fallbacks
Be more permissive about not-found exe_wrapper
Diffstat (limited to 'mesonbuild/compilers/c.py')
| -rw-r--r-- | mesonbuild/compilers/c.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index af3e2c4..ca50c52 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -60,10 +60,12 @@ class CCompiler(Compiler): self.id = 'unknown' self.is_cross = is_cross self.can_compile_suffixes.add('h') - if isinstance(exe_wrapper, str): - self.exe_wrapper = [exe_wrapper] + # If the exe wrapper was not found, pretend it wasn't set so that the + # sanity check is skipped and compiler checks use fallbacks. + if not exe_wrapper or not exe_wrapper.found(): + self.exe_wrapper = None else: - self.exe_wrapper = exe_wrapper + self.exe_wrapper = exe_wrapper.get_command() # Set to None until we actually need to check this self.has_fatal_warnings_link_arg = None |