From d0881eaec7d1300566607bb465acf614ce073b75 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 30 Dec 2016 09:29:21 -0800 Subject: [PATCH] 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 --- src/bootstrap/dist.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 6e3174ed2f6..428c3da7764 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -397,6 +397,13 @@ pub fn rust_src(build: &Build, host: &str) { } } + // 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}",