X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=config.toml.example;h=9b7327ea69e0b1663f3c83b5ed6f9f0bacf36ed0;hb=df716b0e37ed087b8bce20bc04c23efd0fa5b645;hp=c9e17337ee23f801857093ec1237bbb833ae17b3;hpb=c8d5f4dcd120c16099ea85eb32588538d4faa14b;p=rust.git

diff --git a/config.toml.example b/config.toml.example
index c9e17337ee2..9b7327ea69e 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -395,6 +395,15 @@
 # rustc to execute.
 #lld = false
 
+# Indicates whether LLD will be used to link Rust crates during bootstrap on
+# supported platforms. The LLD from the bootstrap distribution will be used
+# 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
 # sysroot.
 #llvm-tools = false
@@ -435,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
 #
@@ -463,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