Allow missing AR/CC/etc tools for precompiled rubies #394
Conversation
This file contains 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
ianks
commented
Jul 1, 2024
crates/rb-sys-build/src/cc.rs
Outdated
| @@ -270,7 +273,13 @@ fn get_tool(env_var: &str, default: &str) -> Command { | |||
| let mut tool_args = shellsplit(tool_args).into_iter(); | |||
| let tool = tool_args.next().unwrap_or_else(|| default.to_string()); | |||
|
|
|||
| let mut cmd = new_command(&tool); | |||
| let mut cmd = if !Path::new(&tool).is_file() { | |||
There was a problem hiding this comment.
imho I prefer to avoid negation in conditionals if possible, so instead I would go with
let mut cmd = if Path::new(&tool).is_file() {
new_command(&tool)
} else {
debug_log!("[WARN] {tool} tool not found, falling back to {default}");
new_command(default)
}feels easier to read/undertsand, but just an opinion xD
driv3r
approved these changes
Jul 1, 2024
crates/rb-sys-build/src/cc.rs
Outdated
| @@ -270,7 +273,13 @@ fn get_tool(env_var: &str, default: &str) -> Command { | |||
| let mut tool_args = shellsplit(tool_args).into_iter(); | |||
| let tool = tool_args.next().unwrap_or_else(|| default.to_string()); | |||
|
|
|||
| let mut cmd = new_command(&tool); | |||
| let mut cmd = if !Path::new(&tool).is_file() { | |||
There was a problem hiding this comment.
imho I prefer to avoid negation in conditionals if possible, so instead I would go with
let mut cmd = if Path::new(&tool).is_file() {
new_command(&tool)
} else {
debug_log!("[WARN] {tool} tool not found, falling back to {default}");
new_command(default)
}feels easier to read/undertsand, but just an opinion xD
|
The CI failures seems GHA related, so I'm going to merge with them failing for now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Sometimes the AR setup in
rbconfig.rbcan incorrect in the case of precompiled binaries. This PR makes us resistant to that.