From 2d172f470d719af2897967d373017010b4dc64d8 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Mon, 9 Jun 2025 15:47:43 +0100 Subject: [PATCH] feat: Always build with native arch in Conan 2 (#2201) Will test it works in https://github.com/XRPLF/clio/pull/2202 Work on: https://github.com/XRPLF/clio/issues/1692 --- docker/ci/conan/clang.profile | 2 +- docker/ci/conan/gcc.profile | 2 +- docs/build-clio.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/ci/conan/clang.profile b/docker/ci/conan/clang.profile index 647ca370..2d8691bc 100644 --- a/docker/ci/conan/clang.profile +++ b/docker/ci/conan/clang.profile @@ -1,5 +1,5 @@ [settings] -arch=x86_64 +arch={{detect_api.detect_arch()}} build_type=Release compiler=clang compiler.cppstd=20 diff --git a/docker/ci/conan/gcc.profile b/docker/ci/conan/gcc.profile index 1575376f..97ef51d9 100644 --- a/docker/ci/conan/gcc.profile +++ b/docker/ci/conan/gcc.profile @@ -1,5 +1,5 @@ [settings] -arch=x86_64 +arch={{detect_api.detect_arch()}} build_type=Release compiler=gcc compiler.cppstd=20 diff --git a/docs/build-clio.md b/docs/build-clio.md index a8c07bfd..fdf788b9 100644 --- a/docs/build-clio.md +++ b/docs/build-clio.md @@ -28,7 +28,7 @@ Clio requires `compiler.cppstd=20` in your Conan profile (`~/.conan/profiles/def ```text [settings] -arch=armv8 +arch={{detect_api.detect_arch()}} build_type=Release compiler=apple-clang compiler.cppstd=20 @@ -44,7 +44,7 @@ tools.build:cxxflags+=["-Wno-missing-template-arg-list-after-template-kw"] ```text [settings] -arch=x86_64 +arch={{detect_api.detect_arch()}} build_type=Release compiler=gcc compiler.cppstd=20