about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-07-15 11:02:35 +0000
committerbors <bors@rust-lang.org>2017-07-15 11:02:35 +0000
commitc4373bd6a29e4f68becfb0874f3199b8b0c2d482 (patch)
tree6525199c2abf7328420fa37c159783dedecf49cd /src/libstd
parent70cd955277fdd3a941177f18bedae4223a48df02 (diff)
parentbdcebc938b461808ed69075543a7c5a3c4777908 (diff)
downloadrust-c4373bd6a29e4f68becfb0874f3199b8b0c2d482.tar.gz
rust-c4373bd6a29e4f68becfb0874f3199b8b0c2d482.zip
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 https://github.com/rust-lang/rust/issues/42635
Diffstat (limited to 'src/libstd')
0 files changed, 0 insertions, 0 deletions