diff --git a/libsql-ffi/build.rs b/libsql-ffi/build.rs index 33b820fcd6..1bc5908cd7 100644 --- a/libsql-ffi/build.rs +++ b/libsql-ffi/build.rs @@ -481,6 +481,8 @@ fn build_multiple_ciphers(target: &str, out_path: &Path) { "x86_64" } else if cc.contains("aarch64") { "arm64" + } else if cc.contains("arm") { + "arm" } else { panic!("Unsupported cross target {}", cc) }; diff --git a/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt b/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt index 6a3da19302..aa48e789d3 100644 --- a/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt +++ b/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt @@ -279,7 +279,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux" # Do not set `-maes -msee4.2` when we are on arm which doesn't support # this instruction set. if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" - OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") + OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" + OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") else() @@ -298,7 +299,9 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux" set(SHARED_LIB_EXPORT_DEFINITION "__attribute__((visibility(\"default\")))") else() if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT ( - CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" + CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" + OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" + OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" )) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -maes") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -maes") @@ -307,7 +310,9 @@ else() endif() if (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT ( - CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" + CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" + OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" + OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" )) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -maes -Wno-error=incompatible-function-pointer-types") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -maes")