Add missing doc for NASM language

pull/10922/head
Xavier Claessens 2 years ago committed by Xavier Claessens
parent d29ef2b128
commit eb731cda75
  1. 4
      docs/markdown/Reference-tables.md
  2. 2
      mesonbuild/interpreter/interpreter.py

@ -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.*

@ -1423,6 +1423,8 @@ class Interpreter(InterpreterBase, HoldableObject):
if 'vala' in langs and 'c' not in langs:
FeatureNew.single_use('Adding Vala language without C', '0.59.0', self.subproject, location=self.current_node)
args.append('c')
if 'nasm' in langs:
FeatureNew.single_use('Adding NASM language', '0.64.0', self.subproject, location=self.current_node)
success = True
for lang in sorted(args, key=compilers.sort_clink):

Loading…
Cancel
Save