about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Wood <david.wood@huawei.com>2022-04-03 06:35:49 +0100
committerDavid Wood <david.wood@huawei.com>2022-04-18 03:47:51 +0100
commit1d207bbd51c6fee3d232782896f337b7d5f0c6bd (patch)
tree839697f172cc0a1957fce0d028bd9bbcb1fd1c6f
parent7593c50d431fdec34d9da2b820ce236f57757435 (diff)
downloadrust-1d207bbd51c6fee3d232782896f337b7d5f0c6bd.tar.gz
rust-1d207bbd51c6fee3d232782896f337b7d5f0c6bd.zip
bootstrap: disable split dwarf by default
Signed-off-by: David Wood <david.wood@huawei.com>
-rw-r--r--config.toml.example9
-rw-r--r--src/bootstrap/config.rs2
2 files changed, 3 insertions, 8 deletions
diff --git a/config.toml.example b/config.toml.example
index b3946b67b0d..dd886879b14 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -477,12 +477,7 @@ changelog-seen = 2
 # Valid values are the same as those accepted by `-C split-debuginfo`
 # (`off`/`unpacked`/`packed`).
 #
-# On Linux, packed split debuginfo is used by default, which splits debuginfo
-# into a separate `rustc.dwp` file. Split DWARF on Linux results in lower
-# linking times (there's less debuginfo for the linker to process),
-# `split-debuginfo` is enabled on default for Linux. Unpacked debuginfo could
-# technically work too, but the cost of running the DWARF packager is marginal
-# and results in debuginfo being in a single file.
+# On Linux, split debuginfo is disabled by default.
 #
 # On Apple platforms, unpacked split debuginfo is used by default. Unpacked
 # debuginfo does not run `dsymutil`, which packages debuginfo from disparate
@@ -494,7 +489,7 @@ changelog-seen = 2
 #
 # On Windows platforms, packed debuginfo is the only supported option,
 # producing a `.pdb` file.
-#split-debuginfo = if linux { packed } else if windows { packed } else if apple { unpacked }
+#split-debuginfo = if linux { off } else if windows { packed } else if apple { unpacked }
 
 # Whether or not `panic!`s generate backtraces (RUST_BACKTRACE)
 #backtrace = true
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index a0c26078055..f273fb42215 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -256,7 +256,7 @@ impl SplitDebuginfo {
         } else if target.contains("windows") {
             SplitDebuginfo::Packed
         } else {
-            SplitDebuginfo::Unpacked
+            SplitDebuginfo::Off
         }
     }
 }