about summary refs log tree commit diff
path: root/config.toml.example
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-10-25 06:18:04 +0200
committerGitHub <noreply@github.com>2019-10-25 06:18:04 +0200
commitee7f9de4c44dff2c83d2ea4cf5e1b2d5846dfb34 (patch)
treec2fcca94f70f6ae782023f61e71be81b03154c51 /config.toml.example
parente25720f1067b9472056333279b651fb243063caf (diff)
parent5defe06f96f62807af0ac09d1896d1baba5d8054 (diff)
downloadrust-ee7f9de4c44dff2c83d2ea4cf5e1b2d5846dfb34.tar.gz
rust-ee7f9de4c44dff2c83d2ea4cf5e1b2d5846dfb34.zip
Rollup merge of #65408 - guanqun:remove-rust-optimize, r=Mark-Simulacrum
reorder config.toml.example options and add one missing option

r? @Mark-Simulacrum
Diffstat (limited to 'config.toml.example')
-rw-r--r--config.toml.example10
1 files changed, 6 insertions, 4 deletions
diff --git a/config.toml.example b/config.toml.example
index be977024426..e832570ed98 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -258,10 +258,9 @@
 [rust]
 
 # Whether or not to optimize the compiler and standard library.
-#
-# Note: the slowness of the non optimized compiler compiling itself usually
-#       outweighs the time gains in not doing optimizations, therefore a
-#       full bootstrap takes much more time with `optimize` set to false.
+# WARNING: Building with optimize = false is NOT SUPPORTED. Due to bootstrapping,
+# building without optimizations takes much longer than optimizing. Further, some platforms
+# fail to build without this optimization (c.f. #65352).
 #optimize = true
 
 # Indicates that the build should be configured for debugging Rust. A
@@ -341,6 +340,9 @@
 # nightly features
 #channel = "dev"
 
+# The root location of the MUSL installation directory.
+#musl-root = "..."
+
 # By default the `rustc` executable is built with `-Wl,-rpath` flags on Unix
 # platforms to ensure that the compiler is usable by default from the build
 # directory (as it links to a number of dynamic libraries). This may not be