aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2018-05-13 10:36:58 -0400
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-06-06 20:02:37 +0000
commitb7d442150dd8575f0756e3bc9e953d0f198e16c6 (patch)
treeea286310111e3e1103db39908cdb8295a3b337f0 /docs
parent58a9555ddf49d851a7eb56874df1d0b3f498e53e (diff)
downloadmeson-b7d442150dd8575f0756e3bc9e953d0f198e16c6.zip
meson-b7d442150dd8575f0756e3bc9e953d0f198e16c6.tar.gz
meson-b7d442150dd8575f0756e3bc9e953d0f198e16c6.tar.bz2
Move <lang>_args to coredata.compiler_options
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/Builtin-options.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md
index 62a37f4..39db4fa 100644
--- a/docs/markdown/Builtin-options.md
+++ b/docs/markdown/Builtin-options.md
@@ -100,9 +100,11 @@ compiler being used:
| Option | Default value | Possible values | Description
| ------ | ------------- | --------------- | -----------
| c_args | | free-form comma-separated list | C compile arguments to use
+| c_link_args | | free-form comma-separated list | C link arguments to use
| c_std | none | none, c89, c99, c11, gnu89, gnu99, gnu11 | C language standard to use
| c_winlibs | see below | free-form comma-separated list | Standard Windows libs to link against
| cpp_args | | free-form comma-separated list | C++ compile arguments to use
+| cpp_link_args| | free-form comma-separated list | C++ link arguments to use
| cpp_std | none | none, c++98, c++03, c++11, c++14, c++17, <br/>c++1z, gnu++03, gnu++11, gnu++14, gnu++17, gnu++1z | C++ language standard to use
| cpp_debugstl | false | true, false | C++ STL debug mode
| cpp_eh | sc | none, a, s, sc | C++ exception handling type