Skip to content

Commit

Permalink
rustbuild: Fix source tarballs and the vendor dir
Browse files Browse the repository at this point in the history
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 rust-lang#38690
  • Loading branch information
alexcrichton authored and nikomatsakis committed Jan 6, 2017
1 parent 0af9faf commit bce648c
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,13 @@ pub fn rust_src(build: &Build) {
}
}

// If we're inside the vendor directory then we need to preserve
// everything as Cargo's vendoring support tracks all checksums and we
// want to be sure we don't accidentally leave out a file.
if spath.contains("vendor") {
return true
}

let excludes = [
"CVS", "RCS", "SCCS", ".git", ".gitignore", ".gitmodules",
".gitattributes", ".cvsignore", ".svn", ".arch-ids", "{arch}",
Expand Down

0 comments on commit bce648c

Please sign in to comment.