Auto merge of #43207 - alexcrichton:update-cargo, r=nikomatsakis

Update the `cargo` submodule Notably pull in an update to the `jobserver` crate to have Cargo set the `CARGO_MAKEFLAGS` environment variable instead of the `MAKEFLAGS` environment variable. cc #42635
rust-lang · Jul 15, 2017 · c4373bd · c4373bd
2 parents 70cd955 + bdcebc9
commit c4373bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/tools/cargo b/src/tools/cargo
+130 −150		Cargo.lock
+1 −1		Cargo.toml
+3 −1		src/bin/bench.rs
+31 −4		src/bin/search.rs
+3 −4		src/cargo/core/workspace.rs
+2 −15		src/cargo/ops/cargo_read_manifest.rs
+2 −2		src/cargo/ops/cargo_rustc/compilation.rs
+12 −1		src/cargo/ops/cargo_rustc/mod.rs
+1 −1		src/cargo/ops/mod.rs
+3 −3		src/cargo/util/paths.rs
+43 −594		src/cargo/util/toml/mod.rs
+452 −0		src/cargo/util/toml/targets.rs
+10 −5		src/doc/crates-io.md
+2 −0		src/doc/manifest.md
+9 −0		src/etc/_cargo
+49 −4		tests/bad-config.rs
+43 −5		tests/bench.rs
+158 −65		tests/build.rs
+1 −0		tests/cargotest/lib.rs
+1 −1		tests/cross-compile.rs
+5 −20		tests/git.rs
+1 −1		tests/jobserver.rs
+12 −37		tests/path.rs
+1 −5		tests/plugins.rs
+134 −1		tests/search.rs
+7 −7		tests/test.rs