Rollup merge of #67741 - estebank:point-at-pat-def, r=Centril

[rust.git] / config.toml.example

diff --git a/config.toml.example b/config.toml.example
index 632b09b92bd7cfd8328849730ee8379bb1fe4638..9b7327ea69e0b1663f3c83b5ed6f9f0bacf36ed0 100644 (file)
--- a/config.toml.example
+++ b/config.toml.example
@@ -400,6 +400,8 @@
 # and not the LLD compiled during the bootstrap.
 #
 # LLD will not be used if we're cross linking or running tests.
+#
+# Explicitly setting the linker for a target will override this option.
 #use-lld = false
 
 # Indicates whether some LLVM tools, like llvm-objdump, will be made available in the
@@ -442,6 +444,10 @@
 # Use LLVM libunwind as the implementation for Rust's unwinder.
 #llvm-libunwind = false
 
+# Enable Windows Control Flow Guard checks in the standard library.
+# This only applies from stage 1 onwards, and only for Windows targets.
+#control-flow-guard = false
+
 # =============================================================================
 # Options for specific targets
 #
@@ -470,6 +476,7 @@
 # Linker to be used to link Rust code. Note that the
 # default value is platform specific, and if not specified it may also depend on
 # what platform is crossing to what platform.
+# Setting this will override the `use-lld` option for Rust code.
 #linker = "cc"
 
 # Path to the `llvm-config` binary of the installation of a custom LLVM to link