Improve default_target to respect current toolchain and config#365
Open
taiki-e wants to merge 1 commit intorust-fuzz:mainfrom
Open
Improve default_target to respect current toolchain and config#365taiki-e wants to merge 1 commit intorust-fuzz:mainfrom
taiki-e wants to merge 1 commit intorust-fuzz:mainfrom
Conversation
This was referenced Mar 2, 2024
fitzgen
reviewed
Mar 4, 2024
Member
fitzgen
left a comment
fitzgen
left a comment
There was a problem hiding this comment.
Can you report the timings for cargo clean && time cargo build on main and on this feature branch?
Comment on lines
+11
to
+18
| if targets.len() > 1 { | ||
| // Config can contain multiple targets, but we don't support it: https://doc.rust-lang.org/cargo/reference/config.html#buildtarget | ||
| panic!("multi-target build is not supported: {targets:?}"); | ||
| } | ||
| targets | ||
| .pop() | ||
| // Get the host triple if the target is not specified in config. | ||
| .unwrap_or_else(|| config.host_triple().unwrap().to_owned()) |
Member
There was a problem hiding this comment.
I think this would be cleaner as match targets.len() { ... }.
| let mut targets = config.build_target_for_cli(None::<&str>).unwrap(); | ||
| if targets.len() > 1 { | ||
| // Config can contain multiple targets, but we don't support it: https://doc.rust-lang.org/cargo/reference/config.html#buildtarget | ||
| panic!("multi-target build is not supported: {targets:?}"); |
Member
There was a problem hiding this comment.
Let's return a result from this function and properly propagate errors rather than panicking here.
|
Rough test of build time: |
|
the branch has conflicts |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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 #355
See #355 (comment) and #355 (comment) for details.
This PR uses the latter approach, which is more accurate. However, I have also implemented the former approach in another branch and can update the PR to use it if needed.