Skip to content

Commit 30847eb

Browse files
committed
use vendor sources by default on dist tarballs
Signed-off-by: onur-ozkan <[email protected]>
1 parent ae3703c commit 30847eb

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1632,7 +1632,6 @@ impl Config {
16321632
set(&mut config.docs_minification, docs_minification);
16331633
set(&mut config.docs, docs);
16341634
set(&mut config.locked_deps, locked_deps);
1635-
set(&mut config.vendor, vendor);
16361635
set(&mut config.full_bootstrap, full_bootstrap);
16371636
set(&mut config.extended, extended);
16381637
config.tools = tools;
@@ -1711,6 +1710,12 @@ impl Config {
17111710
config.in_tree_llvm_info = GitInfo::new(false, &config.src.join("src/llvm-project"));
17121711
config.in_tree_gcc_info = GitInfo::new(false, &config.src.join("src/gcc"));
17131712

1713+
config.vendor = vendor.unwrap_or(
1714+
config.rust_info.is_from_tarball()
1715+
&& config.src.join("vendor").exists()
1716+
&& config.src.join(".cargo/config.toml").exists(),
1717+
);
1718+
17141719
if let Some(rust) = toml.rust {
17151720
let Rust {
17161721
optimize: optimize_toml,

0 commit comments

Comments
 (0)