Fix build on aarch64 android.#1783
Merged
Dead2 merged 1 commit intozlib-ng:developfrom Sep 18, 2024
wolfpld:develop
Merged
Conversation
When building with CMake toolchain provided by NDK, the ARCH variable is not "aarch64", but "aarch64-none-linux-android26" (or similar). The strict string match check causes the WITH_ARMV6 option to be enabled in such a case. In result, arch/arm/slide_hash_armv6.c is compiled, which is not intended to be used on aarch64, and fails. Relax the check and assume aarch64 if the ARCH variable contains aarch64.
nmoinvaz
approved these changes
Sep 17, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #1783 +/- ##
===========================================
+ Coverage 83.33% 83.51% +0.18%
===========================================
Files 132 132
Lines 10021 9997 -24
Branches 2687 2687
===========================================
- Hits 8351 8349 -2
+ Misses 1012 991 -21
+ Partials 658 657 -1 ☔ View full report in Codecov by Sentry. |
Dead2
approved these changes
Sep 17, 2024
Merged
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.
When building with CMake toolchain provided by NDK, the ARCH variable is not "aarch64", but "aarch64-none-linux-android26" (or similar). The strict string match check causes the WITH_ARMV6 option to be enabled in such a case. In result, arch/arm/slide_hash_armv6.c is compiled, which is not intended to be used on aarch64, and fails.
Relax the check and assume aarch64 if the ARCH variable contains aarch64.