about summary refs log tree commit diff
path: root/config.toml.example
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-02-11 16:36:57 +0100
committerGitHub <noreply@github.com>2020-02-11 16:36:57 +0100
commitc8c2b2bc547f4fc0e36ced79cd7f64d514cc5329 (patch)
treed73400050270e15af3d04ed364ecb8ffce0f87f7 /config.toml.example
parentb6024c47663c92f43a125bcafd7f6fffd058d2c1 (diff)
parent87df124ba77a2ce64e11782bddeadae85d26603d (diff)
downloadrust-c8c2b2bc547f4fc0e36ced79cd7f64d514cc5329.tar.gz
rust-c8c2b2bc547f4fc0e36ced79cd7f64d514cc5329.zip
Rollup merge of #68824 - ajpaverd:cfguard-rustbuild, r=Mark-Simulacrum
Enable Control Flow Guard in rustbuild

Now that Rust supports Control Flow Guard (#68180), add a config.toml option to build the standard library with CFG enabled.

r? @nagisa
Diffstat (limited to 'config.toml.example')
-rw-r--r--config.toml.example4
1 files changed, 4 insertions, 0 deletions
diff --git a/config.toml.example b/config.toml.example
index c37cd4a9857..9b7327ea69e 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -444,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
 #