Merge pull request #6789 from dcbaker/deprecated-c-ld

Make linker selection environment variables match docs

3 files changed, 32 insertions, 0 deletions

diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md
index 59e252f..8c55180 100644
--- a/docs/markdown/Reference-tables.md
+++ b/docs/markdown/Reference-tables.md
@@ -255,3 +255,22 @@ These are the values that can be passed to `dependency` function's
 | config-tool       | Use a custom dep tool such as `cups-config`  |
 | system            | System provided (e.g. OpenGL)                |
 | extraframework    | A macOS/iOS framework                        |
+
+
+## Compiler and Linker selection variables
+
+| Language      | Compiler | Linker    | Note                                        |
+|:-------------:|----------|-----------|---------------------------------------------|
+| C             | CC       | CC_LD     |                                             |
+| C++           | CXX      | CXX_LD    |                                             |
+| D             | DC       | DC_LD     | Before 0.54 D_LD*                           |
+| Fortran       | FC       | FC_LD     | Before 0.54 F_LD*                           |
+| Objective-C   | OBJC     | OBJC_LD   |                                             |
+| Objective-C++ | OBJCXX   | OBJCXX_LD | Before 0.54 OBJCPP_LD*                      |
+| 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                  |
+
+*The old environment variales are still supported, but are deprecated and will
+be removed in a future version of meson.
+
diff --git a/docs/markdown/howtox.md b/docs/markdown/howtox.md
index f70ff47..1a2add0 100644
--- a/docs/markdown/howtox.md
+++ b/docs/markdown/howtox.md
@@ -26,6 +26,9 @@ build. Because of this Meson needs to know both the native and the
 cross compiler. The former is set via the environment variables or
 native-files and the latter via the cross file only.
 
+There is a table of all environment variables supported [Here](Reference-tables.md#compiler-and-linker-selection-variables)
+
+
 ## Set dynamic linker
 
 *New in 0.53.0*
@@ -61,6 +64,9 @@ c = 'clang'
 c_ld = 'lld'
 ```
 
+There is a table of all environment variables supported [Here](Reference-tables.md#compiler-and-linker-selection-variables)
+
+
 ## Set default C/C++ language version
 
 ```meson
diff --git a/docs/markdown/snippets/linker_environment_variables_match_docs.md b/docs/markdown/snippets/linker_environment_variables_match_docs.md
new file mode 100644
index 0000000..233547c
--- /dev/null
+++ b/docs/markdown/snippets/linker_environment_variables_match_docs.md
@@ -0,0 +1,7 @@
+## Dynamic Linker environment variables actually match docs
+
+The docs have always claimed that the Dynamic Linker environment variable
+should be `${COMPILER_VAR}_LD`, but that's only the case for about half of
+the variables. The other half are different. In 0.54.0 the variables match.
+The old variables are still supported, but are deprecated and raise a
+deprecation warning.