Skip to content

Commit

Permalink
Add rustflags support to config files
Browse files Browse the repository at this point in the history
`build.rustflags` is treated exactly like `RUSTFLAGS`.

It is a list, so argument lists with spaces work.

`RUSTFLAGS` takes precedent, then `build.rustflags`.
  • Loading branch information
brson committed Mar 16, 2016
1 parent e4baac0 commit 2f01868
Show file tree
Hide file tree
Showing 8 changed files with 906 additions and 451 deletions.
108 changes: 54 additions & 54 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/cargo/ops/cargo_compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ fn scrape_target_config(config: &Config, triple: &str)
None => return Ok(ret),
};
for (lib_name, _) in table.into_iter() {
if lib_name == "ar" || lib_name == "linker" {
if lib_name == "ar" || lib_name == "linker" || lib_name == "rustflags" {
continue
}

Expand Down
Loading

0 comments on commit 2f01868

Please sign in to comment.