aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Cross-compilation.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/markdown/Cross-compilation.md')
-rw-r--r--docs/markdown/Cross-compilation.md24
1 files changed, 20 insertions, 4 deletions
diff --git a/docs/markdown/Cross-compilation.md b/docs/markdown/Cross-compilation.md
index 64196f3..65daa22 100644
--- a/docs/markdown/Cross-compilation.md
+++ b/docs/markdown/Cross-compilation.md
@@ -139,6 +139,22 @@ of a wrapper, these lines are all you need to write. Meson will
automatically use the given wrapper when it needs to run host
binaries. This happens e.g. when running the project's test suite.
+Note that `exe_wrapper` in the cross file is handled separately
+from the `exe_wrapper` argument in
+[`add_test_setup`](Reference-manual_functions.md#add_test_setup_exe_wrapper)
+and [`meson test --wrapper`](Unit-tests.md#other-test-options)
+command line argument. Meson must have `exe_wrapper` specified in the
+cross file or else it will skip tests that attempt to run cross
+compiled binaries. Only the cross file `exe_wrapper` value will be
+stored in the `MESON_EXE_WRAPPER` environment variable. If another
+wrapper is given in the test setup with `exe_wrapper` or as a
+`meson test --wrapper` command line argument, then meson will prepend
+the additional wrapper before the cross file wrapper like the
+following command:
+```
+[prepend_wrapper] <cross_file_wrapper> <exe_binary> <args...>
+```
+
### Properties
In addition to the properties allowed in [all machine
@@ -173,12 +189,12 @@ remember to specify the args as an array and not as a single string
*Since 0.52.0* The `sys_root` property may point to the root of the
host system path (the system that will run the compiled binaries).
-This is used internally by Meson to set the PKG_CONFIG_SYSROOT_DIR
+This is used internally by Meson to set the `PKG_CONFIG_SYSROOT_DIR`
environment variable for pkg-config. If this is unset the host system
is assumed to share a root with the build system.
-*Since 0.54.0* The pkg_config_libdir property may point to a list of
-path used internally by Meson to set the PKG_CONFIG_LIBDIR environment
+*Since 0.54.0* The `pkg_config_libdir` property may point to a list of
+path used internally by Meson to set the `PKG_CONFIG_LIBDIR` environment
variable for pkg-config. This prevents pkg-config from searching cross
dependencies in system directories.
@@ -357,7 +373,7 @@ myvar = meson.get_external_property('somekey')
As of version 0.44.0 Meson supports loading cross files from system
locations (except on Windows). This will be
-$XDG_DATA_DIRS/meson/cross, or if XDG_DATA_DIRS is undefined, then
+`$XDG_DATA_DIRS/meson/cross`, or if `XDG_DATA_DIRS` is undefined, then
/usr/local/share/meson/cross and /usr/share/meson/cross will be tried
in that order, for system wide cross files. User local files can be
put in $XDG_DATA_HOME/meson/cross, or ~/.local/share/meson/cross if