diff options
| author | bors <bors@rust-lang.org> | 2014-10-27 12:02:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-10-27 12:02:42 +0000 |
| commit | e2cd4597dae1ed0aa3967bd2a656a42daa1ad27f (patch) | |
| tree | 9b976166497db6fd783c4a43368dd999d4e8b081 /src | |
| parent | a0efafbd85e2e0965746adba7e899ce904d324dc (diff) | |
| parent | 6f1e6273880eb40ae12ffd11191fd8758ee437b9 (diff) | |
| download | rust-e2cd4597dae1ed0aa3967bd2a656a42daa1ad27f.tar.gz rust-e2cd4597dae1ed0aa3967bd2a656a42daa1ad27f.zip | |
auto merge of #17890 : pnkfelix/rust/fsk-fix-issue-17887, r=alexcrichton
Fixes `config.mk` so that it should not contain multiple inconsistent entries for the same option. Used aforementioned variants to extract options that have explicit `putvar` calls associated with them in the subsequent code. When the explicit `putvar` call was conditional on some potentially complex condition, moved the `putvar` call out to the main control flow of the script so that it always runs if necessary. ---- As a driveby fix, captured the error exit when doing the test run of `rustc --version` from `CFG_LOCAL_RUST_ROOT`, and signal explicit configure failure when it did not run successfully. (If we cannot run `rustc`, we really shouldn't try to keep going.) ---- Fix #17887.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions