From: bors <bors@rust-lang.org>
Date: Thu, 6 Oct 2016 02:26:10 +0000 (-0700)
Subject: Auto merge of #3145 - alexcrichton:rustdoc-cross-test, r=brson
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~229^2^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=885dc89ae188e0712aa19f4691e131fb82128b4c;p=cargo.git

Auto merge of #3145 - alexcrichton:rustdoc-cross-test, r=brson

Test requested --target from source of truth

We skip doc tests for any cross compiles (as they don't work) but to detect a
cross compile we checked `--target` but forgot to check other locations like
`CARGO_BUILD_TARGET` or `[build.target]`. This alters the check to ensure that
it verifies from the source of truth whether a cross compilation happened or
not.

Closes #3143
---

885dc89ae188e0712aa19f4691e131fb82128b4c