bootstrap: untangle static-libstdcpp & llvm-tools

config.toml.example

@@ -89,7 +89,7 @@ changelog-seen = 2
 
 # Link libstdc++ statically into the rustc_llvm instead of relying on a
 # dynamic version to be available.
-#static-libstdcpp = false
+#static-libstdcpp = true
 
 # Whether to use Ninja to build LLVM. This runs much faster than make.
 #ninja = true

src/bootstrap/config.rs

@@ -591,6 +591,7 @@ impl Config {
         config.llvm_optimize = true;
         config.ninja_in_file = true;
         config.llvm_version_check = true;
+        config.llvm_static_stdcpp = true;
         config.backtrace = true;
         config.rust_optimize = true;
         config.rust_optimize_tests = true;

src/bootstrap/native.rs

@@ -566,7 +566,7 @@ fn configure_cmake(
 
     // For distribution we want the LLVM tools to be *statically* linked to libstdc++.
     // We also do this if the user explicitly requested static libstdc++.
-    if builder.config.llvm_tools_enabled || builder.config.llvm_static_stdcpp {
+    if builder.config.llvm_static_stdcpp {
         if !target.contains("msvc") && !target.contains("netbsd") {
             if target.contains("apple") {
                 ldflags.push_all("-static-libstdc++");