Skip to content

Commit bce648c

Browse files
alexcrichtonnikomatsakis
authored andcommitted
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 0af9faf commit bce648c

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
@@ -391,6 +391,13 @@ pub fn rust_src(build: &Build) {
391391
}
392392
}
393393

394+
// If we're inside the vendor directory then we need to preserve
395+
// everything as Cargo's vendoring support tracks all checksums and we
396+
// want to be sure we don't accidentally leave out a file.
397+
if spath.contains("vendor") {
398+
return true
399+
}
400+
394401
let excludes = [
395402
"CVS", "RCS", "SCCS", ".git", ".gitignore", ".gitmodules",
396403
".gitattributes", ".cvsignore", ".svn", ".arch-ids", "{arch}",

0 commit comments

Comments
 (0)