diff options
| author | bors <bors@rust-lang.org> | 2017-02-16 08:20:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-16 08:20:29 +0000 |
| commit | ccd96c945fb5d3a0841e0f9469d27f1fc8142edd (patch) | |
| tree | 8a706e2c33d85fc7ebfc747e3422cefb49961583 /src/bootstrap/dist.rs | |
| parent | d77af7f639adab33b79fc71fdad3dcc813a40c86 (diff) | |
| parent | 1902488228f889bb1acb1d1f6488efe0015a0db2 (diff) | |
| download | rust-ccd96c945fb5d3a0841e0f9469d27f1fc8142edd.tar.gz rust-ccd96c945fb5d3a0841e0f9469d27f1fc8142edd.zip | |
Auto merge of #39824 - alexcrichton:disable-dist-src, r=brson
travis: Disable source tarballs on most builders Currently we create a source tarball on almost all of the `DEPLOY=1` builders but this has the adverse side effect of all source tarballs overriding themselves in the S3 bucket. Normally this is ok but unfortunately a source tarball created on Windows is not buildable on Unix. On Windows the vendored sources contain paths with `\` characters in them which when interpreted on Unix end up in "file not found" errors. Instead of this overwriting behavior, whitelist just one linux builder for producing tarballs and avoid producing tarballs on all other hosts.
Diffstat (limited to 'src/bootstrap/dist.rs')
| -rw-r--r-- | src/bootstrap/dist.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 319c61ece29..c468d4896a6 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -371,6 +371,10 @@ const CARGO_VENDOR_VERSION: &'static str = "0.1.4"; /// Creates the `rust-src` installer component and the plain source tarball pub fn rust_src(build: &Build) { + if !build.config.rust_dist_src { + return + } + println!("Dist src"); let name = pkgname(build, "rust-src"); |
