aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2022-10-14 08:34:34 -0400
committerXavier Claessens <xclaesse@gmail.com>2022-10-24 11:06:57 +0200
commiteb731cda758b5d0e2c83d934714b4e7a2656e805 (patch)
tree293fb0275ca0e62568a0d85e34450f41491dfe6a /docs
parentd29ef2b128c651fa83f1d923290d66cc8eb63223 (diff)
downloadmeson-eb731cda758b5d0e2c83d934714b4e7a2656e805.zip
meson-eb731cda758b5d0e2c83d934714b4e7a2656e805.tar.gz
meson-eb731cda758b5d0e2c83d934714b4e7a2656e805.tar.bz2
Add missing doc for NASM language
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/Reference-tables.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md
index 60303da..7e0cf42 100644
--- a/docs/markdown/Reference-tables.md
+++ b/docs/markdown/Reference-tables.md
@@ -36,6 +36,8 @@ These are return values of the `get_id` (Compiler family) and
| valac | Vala compiler | |
| xc16 | Microchip XC16 C compiler | |
| cython | The Cython compiler | |
+| nasm | The NASM compiler (Since 0.64.0) | |
+| yasm | The YASM compiler (Since 0.64.0) | |
## Linker ids
@@ -167,6 +169,7 @@ These are the parameter names for passing language specific arguments to your bu
| Rust | rust_args | rust_link_args |
| Vala | vala_args | vala_link_args |
| Cython | cython_args | cython_link_args |
+| NASM | nasm_args | |
All these `<lang>_*` options are specified per machine. See in
[specifying options per
@@ -315,6 +318,7 @@ machine](#Environment-variables-per-machine) section for details.
| Rust | RUSTC | RUSTC_LD | Before 0.54 RUST_LD* |
| Vala | VALAC | | Use CC_LD. Vala transpiles to C |
| C# | CSC | CSC | The linker is the compiler |
+| nasm | NASM | | Uses the C linker |
*The old environment variales are still supported, but are deprecated
and will be removed in a future version of Meson.*