config.mk: Added variants of valopt/opt that do not automatically putvar
#17890
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
pnkfelix
force-pushed
the
fsk-fix-issue-17887
branch
from
0672a22 to
db4c2f7
Compare
configure
Outdated
Member
There was a problem hiding this comment.
It's fine to make this just opt and remove the putvar below
Member
|
Looks like some of the |
Member
|
ping @pnkfelix, any updates here? |
pnkfelix
force-pushed
the
fsk-fix-issue-17887
branch
from
db4c2f7 to
b354c32
Compare
Contributor
Author
|
@alexcrichton (thanks for the prod. ;) ) |
bors
added a commit
that referenced
this pull request
Oct 26, 2014
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.
pnkfelix
force-pushed
the
fsk-fix-issue-17887
branch
from
b354c32 to
733e2c6
Compare
… `putvar`. 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.) ---- Finally, in response to review feedback, went through and identified cases where we had been calling `putvar` manually (and thus my naive translation used `opt_nosave`/`valopt_nosave`), and then verified whether a manual `putvar` was necessary (i.e., was each variable in question manually computed somewhere in the `configure` script). In cases that did not meet this criteria, I revised the code to use the `opt`/`valopt` directly and removed the corresponding `putvar`, cleaning things up a teeny bit. ---- Fix rust-lang#17887.
pnkfelix
force-pushed
the
fsk-fix-issue-17887
branch
from
733e2c6 to
6f1e627
Compare
bors
added a commit
that referenced
this pull request
Oct 27, 2014
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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes
config.mkso that it should not contain multiple inconsistent entries for the same option.Used aforementioned variants to extract options that have explicit
putvarcalls associated with them in the subsequent code. When the explicitputvarcall was conditional on some potentially complex condition, moved theputvarcall 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 --versionfromCFG_LOCAL_RUST_ROOT, and signal explicit configure failure when it did not run successfully. (If we cannot runrustc, we really shouldn't try to keep going.)Fix #17887.