From: bors <bors@rust-lang.org>
Date: Wed, 5 Oct 2016 16:16:15 +0000 (-0700)
Subject: Auto merge of #3157 - japaric:target-rustflags, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2~57
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=85df1880d84a83dfb28a2ec825f4c1abef3aac9e;p=cargo.git

Auto merge of #3157 - japaric:target-rustflags, r=alexcrichton

add support for per-target rustflags in .cargo/config

you can now specify rustflags on a per-target basis in .cargo/config:

``` toml
[target.x86_64-unknown-linux-gnu]
rustflags = ["x86", "specific", "flags"]

[target.arm-unknown-linux-gnueabi]
rustflags = ["arm", "specific", "flags"]
```

If both build.rustflags and target.*.rustflags are specified, the
target.* ones will be used.

As before RUSTFLAGS overrides either set.

closes #3153

r? @alexcrichton I've only added a smoke test and a precedence test. Let me know if I should add more tests!
---

85df1880d84a83dfb28a2ec825f4c1abef3aac9e