diff options
| author | Tristan Partin <tristan@neon.tech> | 2023-06-05 09:30:37 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-06-06 10:07:36 -0400 |
| commit | 58aa301accc2dc1f107c2e77b8187de94fb1bd0c (patch) | |
| tree | f8a846a7388cad6aed20b7ce2cffc78b23dbe612 /mesonbuild | |
| parent | e20717ed8f9f746a233e2bd2b3018997a3f73799 (diff) | |
| download | meson-58aa301accc2dc1f107c2e77b8187de94fb1bd0c.zip meson-58aa301accc2dc1f107c2e77b8187de94fb1bd0c.tar.gz meson-58aa301accc2dc1f107c2e77b8187de94fb1bd0c.tar.bz2 | |
Override find_program('meson')
This override transparently upgrades anyone using it to this better
functionality.
Fixes #8511
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 9ca7742..81a88e5 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1665,6 +1665,10 @@ class Interpreter(InterpreterBase, HoldableObject): if progobj: return progobj + if args[0] == 'meson': + # Override find_program('meson') to return what we were invoked with + return ExternalProgram('meson', self.environment.get_build_command(), silent=True) + fallback = None wrap_mode = self.coredata.get_option(OptionKey('wrap_mode')) if wrap_mode != WrapMode.nofallback and self.environment.wrap_resolver: |