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/interpreter.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/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index cf2e826..60c8bc1 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1681,10 +1681,8 @@ class MesonMain(InterpreterObject): @permittedKwargs({}) def has_exe_wrapper_method(self, args, kwargs): if self.is_cross_build_method(None, None) and \ - 'binaries' in self.build.environment.cross_info.config and \ self.build.environment.cross_info.need_exe_wrapper(): - exe_wrap = self.build.environment.cross_info.config['binaries'].get('exe_wrapper', None) - if exe_wrap is None: + if self.build.environment.exe_wrapper is None: return False # We return True when exe_wrap is defined, when it's not needed, and # when we're compiling natively. The last two are semantically confusing. |