Skip to content

Commit

Permalink
docs: Document that meson 0.52.0 allows layering cross files [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
dcbaker authored and jpakkane committed Nov 5, 2019
1 parent aba8792 commit 11f1adb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
5 changes: 5 additions & 0 deletions docs/markdown/Cross-compilation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 4 additions & 3 deletions docs/markdown/Native-environments.md
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 11f1adb

Please sign in to comment.