Auto merge of #36441 - alexcrichton:rustbuild-target, r=brson

author bors <bors@rust-lang.org>

Fri, 16 Sep 2016 11:01:01 +0000 (04:01 -0700)

committer GitHub <noreply@github.com>

Fri, 16 Sep 2016 11:01:01 +0000 (04:01 -0700)
author bors <bors@rust-lang.org>
Fri, 16 Sep 2016 11:01:01 +0000 (04:01 -0700)
committer GitHub <noreply@github.com>
Fri, 16 Sep 2016 11:01:01 +0000 (04:01 -0700)
diff --cc src/bootstrap/compile.rs
Simple merge
diff --cc src/rustc/std_shim/Cargo.lock
Simple merge
author	bors <bors@rust-lang.org>
	Fri, 16 Sep 2016 11:01:01 +0000 (04:01 -0700)
committer	GitHub <noreply@github.com>
	Fri, 16 Sep 2016 11:01:01 +0000 (04:01 -0700)
		1	2
src/bootstrap/compile.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/rustc/std_shim/Cargo.lock	patch \|	diff1 \|	diff2 \|	blob \| history