Merge pull request #191 from eosnetworkfoundation/yarkin/support_arm

Support arm
eosnetworkfoundation · Feb 29, 2024 · e87222a · e87222a
2 parents f2a5f48 + cff5608
commit e87222a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,10 +14,10 @@ set(CMAKE_TOOLCHAIN_FILE
 )
 endif()
 
-include(cmake/conan.cmake)
-
 project(eos-evm-node)
 
+include(cmake/conan.cmake)
+
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 7)
 set(VERSION_PATCH 0)

diff --git a/cmake/conan.cmake b/cmake/conan.cmake
@@ -16,7 +16,11 @@
 
 function(guess_conan_profile)
   if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
-    set(PROFILE linux_gcc_11_release)
+    if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+      set(PROFILE linux_arm_gcc_11_release)
+    else()
+      set(PROFILE linux_gcc_11_release)
+    endif()
   elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
     if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
       set(PROFILE macos_arm_clang_13_release)

diff --git a/cmake/profiles/linux_arm_gcc_11_debug b/cmake/profiles/linux_arm_gcc_11_debug
@@ -0,0 +1,12 @@
+[settings]
+os=Linux
+os_build=Linux
+arch=armv8
+arch_build=armv8
+compiler=gcc
+compiler.version=11
+compiler.libcxx=libstdc++11
+build_type=Debug
+[options]
+[build_requires]
+[env]
diff --git a/cmake/profiles/linux_arm_gcc_11_release b/cmake/profiles/linux_arm_gcc_11_release
@@ -0,0 +1,12 @@
+[settings]
+os=Linux
+os_build=Linux
+arch=armv8
+arch_build=armv8
+compiler=gcc
+compiler.version=11
+compiler.libcxx=libstdc++11
+build_type=Release
+[options]
+[build_requires]
+[env]
diff --git a/external/silkworm b/external/silkworm
+5 −3		CMakeLists.txt
+5 −1		cmake/conan.cmake
+12 −0		cmake/profiles/linux_arm_gcc_11_debug
+12 −0		cmake/profiles/linux_arm_gcc_11_release
+7 −0		silkworm/silkrpc/commands/ots_api.cpp