From ab214b56962ff7759ed4d9bc9f326e9d094c632a Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 27 Feb 2023 07:26:07 -0600 Subject: handle i?86 for 32-bit CMake builds --- CMakeLists.txt | 3 ++- scripts/test | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e8c0de..7847830 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -314,7 +314,8 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS" AND "${CMAKE_SYSTEM_PROCESSOR}" S set(HOST_X86_64 true) elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86_64|amd64)") set(HOST_X86_64 true) -elseif("${CMAKE_SYSTEM_NAME}" MATCHES "[i386|x86]") +elseif("${CMAKE_SYSTEM_NAME}" MATCHES "[i?86|x86]") + set(ENABLE_ASM false) set(HOST_I386 true) elseif("${CMAKE_SYSTEM_NAME}" MATCHES "mips64") set(HOST_MIPS64 true) diff --git a/scripts/test b/scripts/test index 48d7a55..0eb2c06 100755 --- a/scripts/test +++ b/scripts/test @@ -115,10 +115,11 @@ elif [ "x$ARCH" = "xandroid" ]; then echo "##### Date: `date`, Native API level: $NAL, ABI: $ABI" ( - build_dir=build_$NAL_$ABI + build_dir=build-$NAL_$ABI rm -fr $build_dir include/openssl/opensslconf.h mkdir $build_dir cd $build_dir + echo "##### cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja -DANDROID_NDK=$ANDROID_NDK_HOME -DCMAKE_TOOLCHAIN_FILE=$TC_FILE -DANDROID_ABI=$ABI -DANDROID_NATIVE_API_LEVEL=$NAL .." cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja \ -DANDROID_NDK=$ANDROID_NDK_HOME \ -DCMAKE_TOOLCHAIN_FILE=$TC_FILE \ -- cgit v1.2.3-55-g6feb