Fix for building on aarch64 with 32-bit OS #1015
Merged
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
andrewhop
approved these changes
May 15, 2023
waahm7
approved these changes
May 15, 2023
| @@ -682,7 +682,14 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64") | |||
| elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86|i386|i686") | |||
| set(ARCH "x86") | |||
| elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64.*|ARM64|aarch64") | |||
| set(ARCH "aarch64") | |||
| # If ARCH is originally detected as 64-bit, perform an additional check | |||
There was a problem hiding this comment.
Is this only an Arm issue?
There was a problem hiding this comment.
it's also x86 issue but it was already fixed, see few lines above
torben-hansen
approved these changes
May 15, 2023
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.
Issues:
N/A
Description of changes:
In some cases, when building on a 64-bit Arm architecture (
aarch64)that runs a 32-bit OS, CMake sets
CMAKE_SYSTEM_PROCESSOR = aarch64.This change adds an additional check (similarly as for x86) that correctly
initializes the build in the above described situation.
Call-outs:
Point out areas that need special attention or support during the review process. Discuss architecture or design changes.
Testing:
How is this change tested (unit tests, fuzz tests, etc.)? Are there any testing steps to be verified by the reviewer?
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.