Skip to content

Commit d0881ea

Browse files
committed
rustbuild: Fix source tarballs and the vendor dir
The source tarball creation step would attempt to skip a number of files that we want to ignore ourselves, but once we've hit the vendor directory we don't want to skip anything so be sure to vendor everything inside that directory. Closes #38690
1 parent 7f2d2af commit d0881ea

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/bootstrap/dist.rs

+7
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,13 @@ pub fn rust_src(build: &Build, host: &str) {
397397
}
398398
}
399399

400+
// If we're inside the vendor directory then we need to preserve
401+
// everything as Cargo's vendoring support tracks all checksums and we
402+
// want to be sure we don't accidentally leave out a file.
403+
if spath.contains("vendor") {
404+
return true
405+
}
406+
400407
let excludes = [
401408
"CVS", "RCS", "SCCS", ".git", ".gitignore", ".gitmodules",
402409
".gitattributes", ".cvsignore", ".svn", ".arch-ids", "{arch}",

0 commit comments

Comments
 (0)