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 the arch_host naming for armv8 (-> aarch64) #14362

Merged
merged 4 commits into from
Aug 10, 2023
Merged

fix the arch_host naming for armv8 (-> aarch64) #14362

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32d6b9c
fix the arch_host naming for armv8 (-> aarch64)
bavardage Jul 24, 2023
7eeb5e4
fix tests
bavardage Jul 24, 2023
5bc2ace
Merge branch 'release/2.0' into fix/cmake-system-processor-aarch64
memsharded Aug 8, 2023
74ab5e8
per OS arch mapping
memsharded Aug 8, 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
2 changes: 2 additions & 0 deletions conan/tools/cmake/toolchain/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,8 @@ def _get_cross_build(self):
if hasattr(self._conanfile, "settings_build"):
os_host = self._conanfile.settings.get_safe("os")
arch_host = self._conanfile.settings.get_safe("arch")
arch_host = {"armv8": "aarch64"}.get(arch_host, arch_host)

if system_name is None: # Try to deduce
_system_version = None
_system_processor = None
Expand Down
4 changes: 2 additions & 2 deletions conans/test/integration/toolchains/cmake/test_cmaketoolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def test_cross_build():
toolchain = client.load("conan_toolchain.cmake")

assert "set(CMAKE_SYSTEM_NAME Linux)" in toolchain
assert "set(CMAKE_SYSTEM_PROCESSOR armv8)" in toolchain
assert "set(CMAKE_SYSTEM_PROCESSOR aarch64)" in toolchain


def test_cross_build_linux_to_macos():
Expand Down Expand Up @@ -158,7 +158,7 @@ def test_cross_arch():
toolchain = client.load("conan_toolchain.cmake")

assert "set(CMAKE_SYSTEM_NAME Linux)" in toolchain
assert "set(CMAKE_SYSTEM_PROCESSOR armv8)" in toolchain
assert "set(CMAKE_SYSTEM_PROCESSOR aarch64)" in toolchain


def test_no_cross_build_arch():
Expand Down