fix: prioritize Android over Linux in build.rs target detection - #20759
Merged
Merged
Conversation
Android targets (e.g. aarch64-linux-android) contain the "linux" keyword, causing them to match the Linux branches before reaching the Android ones. Move Android match arms above Linux to fix this.
federicobarbacovi
approved these changes
Feb 23, 2026
Collaborator
|
Nice |
5 tasks done
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
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.
Summary
aarch64-linux-android,x86_64-linux-android) contain thelinuxkeyword, causing them to incorrectly match the Linux match arms inbuild.rsbefore reaching the Android onesTest plan
cargo check -p barretenberg-rs --target aarch64-linux-androidwithBB_LIB_DIRpointing to Android libs — passescargo check -p barretenberg-rs --target aarch64-linux-androidwithBARRETENBERG_VERSION=4.0.0-rc.5— successfully downloadsbarretenberg-static-arm64-android.tar.gz(notarm64-linux)