Process overrides in custom tools logic#88
Merged
Vollbrecht merged 3 commits intoesp-rs:masterfrom Jun 15, 2024
Merged
Conversation
The custom tools parsing logic introduced in esp-rs#85 does not process the overrides in tools.json. This omission breaks compilation on macOS and likely several other platforms. This commit adds override parsing logic to properly handle overrides from tools.json Signed-off-by: Tom Stokes <tomstokes@radixengineering.com>
The custom tools parsing logic introduced in esp-rs#85 has incorrect ARCH values. The list of possible ARCH values can be found in the Rust documentation: https://doc.rust-lang.org/std/env/consts/constant.ARCH.html Unfortunately, the Rust standard library doesn't distinguish between armel and armhf for 32-bit ARM, so this defaults to armel for 32-bit ARM. The previous code would not properly match any ARM platforms (armv7 and armv8 are not possible ARCH values) and was missing 32-bit Linux. Signed-off-by: Tom Stokes <tomstokes@radixengineering.com>
The newest version of clippy catches a clippy::manual-unwrap-or-default issue, causing CI builds to fail. This implements the recommended fix and therefore should fix the CI builds. Signed-off-by: Tom Stokes <tomstokes@radixengineering.com>
Collaborator
|
Thanks for the PR! LGTM Could you tell me if you tested it on aarch64 or x86 Mac? Regarding the ARCH arm matching, i couldn't find a rust target that doesn't use "arm" so thanks for that. |
This was referenced Jun 15, 2024
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
2 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.
The custom tools parsing logic introduced in #85 does not process the overrides in tools.json. This omission breaks compilation on macOS and likely several other platforms.
This commit adds override parsing logic to properly handle overrides from tools.json