diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-03-11 18:46:31 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-03-12 10:18:16 -0700 |
| commit | b5798a9be80a239b54b69a6a750a8aeeaadbf1fc (patch) | |
| tree | bf3b73ac091f0e902b4fb8cdf1dee22495d5e755 /src/bootstrap/lib.rs | |
| parent | f88b24b34c6d17ebe4014bec5a0f7c2a57c529c7 (diff) | |
| download | rust-b5798a9be80a239b54b69a6a750a8aeeaadbf1fc.tar.gz rust-b5798a9be80a239b54b69a6a750a8aeeaadbf1fc.zip | |
Update Cargo to fix nightly channel
This commit updates Cargo with rust-lang/cargo#3820 which includes a fix for rust-lang/cargo#3819. At the same time this also slightly tweaks how rustbuild builds cargo to ensure that all the build information (including git info and such) makes its way into the binary. Closes rust-lang/cargo#3820
Diffstat (limited to 'src/bootstrap/lib.rs')
| -rw-r--r-- | src/bootstrap/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 618e4d67705..72aec15e532 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -232,7 +232,7 @@ impl Build { None => false, }; let rust_info = channel::GitInfo::new(&src); - let cargo_info = channel::GitInfo::new(&src.join("src/tools/cargo")); + let cargo_info = channel::GitInfo::new(&src.join("cargo")); Build { flags: flags, |