aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-02-06 13:53:40 -0800
committerDylan Baker <dylan@pnwbakers.com>2019-02-11 12:50:32 -0800
commitb5d847e38c90292af351ff4aa99cef0300886660 (patch)
tree0c81d8195ea2647ce41139010d27d390e2ca6e36 /docs
parent5b896ed70bbf18e633bbeca442c90610e3d66a22 (diff)
downloadmeson-b5d847e38c90292af351ff4aa99cef0300886660.zip
meson-b5d847e38c90292af351ff4aa99cef0300886660.tar.gz
meson-b5d847e38c90292af351ff4aa99cef0300886660.tar.bz2
allow paths to be set in the cross file
Just like the previous patch, but for cross files Fixes #1433
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/Cross-compilation.md16
-rw-r--r--docs/markdown/snippets/native-file-paths.md6
2 files changed, 18 insertions, 4 deletions
diff --git a/docs/markdown/Cross-compilation.md b/docs/markdown/Cross-compilation.md
index 7d316ed..36620eb 100644
--- a/docs/markdown/Cross-compilation.md
+++ b/docs/markdown/Cross-compilation.md
@@ -150,7 +150,7 @@ binaries are not actually compatible. In such cases you may use the
needs_exe_wrapper = true
```
-The last bit is the definition of host and target machines. Every
+The next bit is the definition of host and target machines. Every
cross build definition must have one or both of them. If it had
neither, the build would not be a cross build but a native build. You
do not need to define the build machine, as all necessary information
@@ -186,6 +186,20 @@ If you do not define your host machine, it is assumed to be the build
machine. Similarly if you do not specify target machine, it is assumed
to be the host machine.
+Additionally, you can define the paths that you want to install to in your
+cross file. This may be especially useful when cross compiling an entire
+operating system, or for operating systems to use internally for consistency.
+
+```ini
+[paths]
+prefix = '/my/prefix'
+libdir = 'lib/i386-linux-gnu'
+bindir = 'bin'
+```
+
+This will be overwritten by any options passed on the command line.
+
+
## Starting a cross build
diff --git a/docs/markdown/snippets/native-file-paths.md b/docs/markdown/snippets/native-file-paths.md
index 6979241..b091c40 100644
--- a/docs/markdown/snippets/native-file-paths.md
+++ b/docs/markdown/snippets/native-file-paths.md
@@ -1,4 +1,4 @@
-## Native File Paths and Directories
+## Native and Cross File Paths and Directories
-A new `[paths]` section has been added to the native file. This can be used to
-set paths such a prefix and libdir in a persistent way.
+A new `[paths]` section has been added to native and cross files. This
+can be used to set paths such a prefix and libdir in a persistent way.