diff options
author | Eric Engestrom <[email protected]> | 2019-07-31 11:49:03 +0100 |
---|---|---|
committer | Eric Engestrom <[email protected]> | 2019-08-01 00:42:02 +0100 |
commit | a563bb9e28318df30da0b0ab9c8280a8416cd472 (patch) | |
tree | 1147476e7056f3c9a3ae66d149c979e871f0cc36 /docs | |
parent | 8a1e8036430eb7fbfca8c17cb16dc39e94da248b (diff) |
docs: reword meson instructions
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Caio Marcelo de Oliveira Filho <[email protected]>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/meson.html | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/docs/meson.html b/docs/meson.html index c3e4a558391..d46741e6799 100644 --- a/docs/meson.html +++ b/docs/meson.html @@ -255,6 +255,18 @@ Then configure meson: </dd> <dd><p> +Meson < 0.49 doesn't support native files, so to specify a custom +<code>llvm-config</code> you need to modify your <code>$PATH</code> (or +<code>%PATH%</code> on windows), which will be searched for +<code>llvm-config</code>, <code>llvm-config<i>$version</i></code>, +and <code>llvm-config-<i>$version</i></code>: +</p> +<pre> +PATH=/path/to/folder/with/llvm-config:$PATH meson build +</pre> +</dd> + +<dd><p> For selecting llvm-config for cross compiling a <a href="https://mesonbuild.com/Cross-compilation.html#defining-the-environment">"cross file"</a> should be used. It uses the same format as the native file above: @@ -275,13 +287,6 @@ should be used. It uses the same format as the native file above: See the <a href="#cross-compilation">Cross Compilation</a> section for more information. </dd> -<dd><p> -For older versions of meson <code>$PATH</code> (or <code>%PATH%</code> on -windows) will be searched for llvm-config (and llvm-config$version and -llvm-config-$version), you can override this environment variable to control -the search: <code>PATH=/path/with/llvm-config:$PATH meson build</code>. -</p></dd> - <dt><code>PKG_CONFIG_PATH</code></dt> <dd><p>The <code>pkg-config</code> utility is a hard requirement for configuring and |