interpreter: add native argument to override_find_program()

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Author: dcbaker

docs/markdown/snippets/subproject_and_override_program_native.md

@@ -4,3 +4,10 @@ Subprojects may now be built for the host or build machine (or both). This means
 that build time dependencies can be built for the matching running the build in a
 cross compile setup. When a subproject is run for the build machine it will act
 just like a normal build == host setup, except that no targets will be installed.
+
+This necessarily means that `meson.override_find_program()` must differentiate
+between programs for the host and those for the build machine, as you may need
+two versions of the same program, which have different outputs based on the
+machine they are for. For backwards compatibility reasons the default is for the
+host machine. Inside a native subproject the host and build machine will both be
+the build machine.

docs/yaml/builtins/meson.yaml

@@ -392,6 +392,15 @@ methods:
         type: exe | file | external_program
         description: The program to set as the override for `progname`.
 
+      native:
+        type: bool
+        since: 1.11.0
+        default: false
+        description : |
+          If set to `true`, the override is for the build machine, and will be returned
+          by `find_program(..., native : true)`, otherwise for the host machine. This
+          is an important distinction when cross compiling.
+
   - name: override_dependency
     returns: void
     since: 0.54.0

mesonbuild/interpreter/mesonmain.py

@@ -320,9 +320,9 @@ def install_dependency_manifest_method(self, args: T.Tuple[str], kwargs: 'TYPE_k
 
     @FeatureNew('meson.override_find_program', '0.46.0')
     @typed_pos_args('meson.override_find_program', str, (mesonlib.File, ExternalProgram, build.Executable))
-    @noKwargs
+    @typed_kwargs('meson.override_find_program', NATIVE_KW.evolve(since='1.11.0'))
     @InterpreterObject.method('override_find_program')
-    def override_find_program_method(self, args: T.Tuple[str, T.Union[mesonlib.File, ExternalProgram, build.Executable]], kwargs: 'TYPE_kwargs') -> None:
+    def override_find_program_method(self, args: T.Tuple[str, T.Union[mesonlib.File, ExternalProgram, build.Executable]], kwargs: NativeKW) -> None:
         name, exe = args
         if isinstance(exe, mesonlib.File):
             abspath = exe.absolute_path(self.interpreter.environment.source_dir,
@@ -332,7 +332,7 @@ def override_find_program_method(self, args: T.Tuple[str, T.Union[mesonlib.File,
             exe = OverrideProgram(name, self.interpreter.project_version, command=[abspath])
         elif isinstance(exe, build.Executable):
             exe = build.OverrideExecutable(exe, self.interpreter.project_version)
-        self.interpreter.add_find_program_override(name, exe)
+        self.interpreter.add_find_program_override(name, exe, kwargs['native'])
 
     @typed_kwargs(
         'meson.override_dependency',

test cases/native/10 native subproject/maingen.c

@@ -0,0 +1,8 @@
+#include <stdio.h>
+
+int main(void) {
+    printf("const char * gen_main(void) {\n");
+    printf("    return \"int main() \";\n");
+    printf("}\n");
+    return 0;
+}

test cases/native/10 native subproject/meson.build

@@ -4,6 +4,8 @@ project('native subproject', 'c', meson_version : '>= 1.11.0')
 subproject('both', native : true)
 subproject('both', native : false)
 
+maingen = executable('maingen', 'maingen.c', native : true)
+meson.override_find_program('maingen', maingen, native : true)
 gen = subproject('buildtool', native : true).get_variable('e')
 
 ct = custom_target(

test cases/native/10 native subproject/subprojects/buildtool/buildtool.c

@@ -1,6 +1,9 @@
 #include <stdio.h>
 
+const char * gen_main(void);
+
 int main() {
-    printf("int main() { return 0; }\n");
+    printf("%s", gen_main());
+    printf("{ return 0; }\n");
     return 0;
 }

test cases/native/10 native subproject/subprojects/buildtool/meson.build

@@ -1,6 +1,15 @@
 project('buildtool', 'c', meson_version : '>= 1.11.0')
 
-e = executable('buildtool', 'buildtool.c')
+maingen = find_program('maingen')
+
+ct = custom_target(
+  'gen',
+  command : [maingen],
+  output : 'gen.c',
+  capture : true,
+)
+
+e = executable('buildtool', 'buildtool.c', ct)
 
 meson.override_find_program('buildtool', e)