diff options
| -rw-r--r-- | docs/markdown/Cross-compilation.md | 5 | ||||
| -rw-r--r-- | docs/markdown/Native-environments.md | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/docs/markdown/Cross-compilation.md b/docs/markdown/Cross-compilation.md index c46082a..43e1382 100644 --- a/docs/markdown/Cross-compilation.md +++ b/docs/markdown/Cross-compilation.md @@ -206,6 +206,11 @@ bindir = 'bin' This will be overwritten by any options passed on the command line. +Since meson 0.52.0 it is possible to layer cross files together. This +works like native file layering: the purpose is to compose cross files +together, and values from the second cross file will replace those +from the first. + ## Starting a cross build diff --git a/docs/markdown/Native-environments.md b/docs/markdown/Native-environments.md index 9adddc7..41e678e 100644 --- a/docs/markdown/Native-environments.md +++ b/docs/markdown/Native-environments.md @@ -62,9 +62,10 @@ command line will override any options in the native file. For example, passing ## Loading multiple native files -Unlike cross file, native files allow layering. More than one native file can be -loaded, with values from a previous file being overridden by the next. The -intention of this is not overriding, but to allow composing native files. +Native files allow layering (cross files can be layered since meson 0.52.0). +More than one native file can be loaded, with values from a previous file being +overridden by the next. The intention of this is not overriding, but to allow +composing native files. For example, if there is a project using C and C++, python 3.4-3.7, and LLVM 5-7, and it needs to build with clang 5, 6, and 7, and gcc 5.x, 6.x, and 7.x; |