about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authoronur-ozkan <work@onurozkan.dev>2024-12-04 15:58:23 +0300
committeronur-ozkan <work@onurozkan.dev>2024-12-04 16:01:58 +0300
commit30847ebb255abbda590460e86a21b7b1c7c3b273 (patch)
tree8d1b4a15fc767232437f86b521156991c72821f9 /src/bootstrap
parentae3703cdf271b07cbc7cbaeda0ea8ab6bba60160 (diff)
downloadrust-30847ebb255abbda590460e86a21b7b1c7c3b273.tar.gz
rust-30847ebb255abbda590460e86a21b7b1c7c3b273.zip
use vendor sources by default on dist tarballs
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/src/core/config/config.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index b06147055f2..69aa6492eb6 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -1632,7 +1632,6 @@ impl Config {
         set(&mut config.docs_minification, docs_minification);
         set(&mut config.docs, docs);
         set(&mut config.locked_deps, locked_deps);
-        set(&mut config.vendor, vendor);
         set(&mut config.full_bootstrap, full_bootstrap);
         set(&mut config.extended, extended);
         config.tools = tools;
@@ -1711,6 +1710,12 @@ impl Config {
         config.in_tree_llvm_info = GitInfo::new(false, &config.src.join("src/llvm-project"));
         config.in_tree_gcc_info = GitInfo::new(false, &config.src.join("src/gcc"));
 
+        config.vendor = vendor.unwrap_or(
+            config.rust_info.is_from_tarball()
+                && config.src.join("vendor").exists()
+                && config.src.join(".cargo/config.toml").exists(),
+        );
+
         if let Some(rust) = toml.rust {
             let Rust {
                 optimize: optimize_toml,