Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for building on aarch64 with 32-bit OS #1015

Merged
merged 2 commits into from
May 16, 2023
Merged

Fix for building on aarch64 with 32-bit OS #1015

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb1a081
Fix for building on aarch64 with 32-bit OS
May 15, 2023
d4dbd9a
Merge branch 'main' into fix-cmake-arm-32vs64bit
dkostic May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this only an Arm issue?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's also x86 issue but it was already fixed, see few lines above

# to determine whether to build as 32-bit or 64-bit. This happens in some
# cases such as when building on an 64-bit CPU where the OS is 32-bit.
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(ARCH "aarch64")
else()
set(ARCH "arm")
endif()
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm*")
set(ARCH "arm")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc64le|ppc64le")
Expand Down