diff options
| author | bors <bors@rust-lang.org> | 2017-03-11 19:10:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-11 19:10:10 +0000 |
| commit | e4eb964dd950eb9afe861efc4ea5fc58c33b8296 (patch) | |
| tree | 6f8c845c76f0c226f979c063822c47065ae06a33 /src | |
| parent | 4b1dfbd86c5ab59a856e191556bf1c8f7e103f60 (diff) | |
| parent | 8db566ee966d5dffbe4fb1a8b29bf4d4ae62b75a (diff) | |
| download | rust-e4eb964dd950eb9afe861efc4ea5fc58c33b8296.tar.gz rust-e4eb964dd950eb9afe861efc4ea5fc58c33b8296.zip | |
Auto merge of #40443 - alexcrichton:fix-nightlies-again, r=alexcrichton
rustbuild: Fix a bug when manifesting with Cargo The wrong Cargo version was passed down so it ended up panicking the build-manifest script as it couldn't find the right tarball.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/dist.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 5c4b718490c..7c463bec5ff 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -944,7 +944,7 @@ pub fn hash_and_sign(build: &Build) { cmd.arg(distdir(build)); cmd.arg(today.trim()); cmd.arg(build.rust_package_vers()); - cmd.arg(build.cargo_info.version(build, &build.cargo_release_num())); + cmd.arg(build.package_vers(&build.cargo_release_num())); cmd.arg(addr); t!(fs::create_dir_all(distdir(build))); |