summaryrefslogtreecommitdiff
path: root/docs/markdown/Cross-compilation.md
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2023-04-17 12:46:46 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2023-06-19 18:03:57 +0300
commitb0d2a925849be8826ec5f18755a5aed743f5c72d (patch)
tree0cafe07707aeb97d71cc27ff0f7fe87281b8a9b1 /docs/markdown/Cross-compilation.md
parent23efc1abeac2a7b95e22aaeb6ca178b492bf5247 (diff)
downloadmeson-b0d2a925849be8826ec5f18755a5aed743f5c72d.tar.gz
Add kernel and subsystem properties to machine objects.
Diffstat (limited to 'docs/markdown/Cross-compilation.md')
-rw-r--r--docs/markdown/Cross-compilation.md12
1 files changed, 9 insertions, 3 deletions
diff --git a/docs/markdown/Cross-compilation.md b/docs/markdown/Cross-compilation.md
index fb222220e..1d0e46332 100644
--- a/docs/markdown/Cross-compilation.md
+++ b/docs/markdown/Cross-compilation.md
@@ -212,6 +212,8 @@ target machines look the same. Here is a sample for host machine.
```ini
[host_machine]
system = 'windows'
+subsystem = 'windows'
+kernel = 'nt'
cpu_family = 'x86'
cpu = 'i686'
endian = 'little'
@@ -221,9 +223,13 @@ These values define the machines sufficiently for cross compilation
purposes. The corresponding target definition would look the same but
have `target_machine` in the header. These values are available in
your Meson scripts. There are three predefined variables called,
-surprisingly, [[@build_machine]], [[@host_machine]] and [[@target_machine]].
-Determining the operating system of your host machine is simply a
-matter of calling `host_machine.system()`.
+surprisingly, [[@build_machine]], [[@host_machine]] and
+[[@target_machine]]. Determining the operating system of your host
+machine is simply a matter of calling `host_machine.system()`.
+Starting from version 1.2.0 you can get more fine grained information
+using the `.subsystem()` and `.kernel()` methods. The return values of
+these functions are documented in [the reference table
+page](Reference-tables.md).
There are two different values for the CPU. The first one is
`cpu_family`. It is a general type of the CPU. This should have a