factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle i?86 for 32-bit CMake builds

Browse Source
This commit is contained in:
Brent Cook 2023-02-27 07:26:07 -06:00
parent 305d0532ab
commit ab214b5696
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -314,7 +314,8 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS" AND "${CMAKE_SYSTEM_PROCESSOR}" S
set(HOST_X86_64 true) set(HOST_X86_64 true)
elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86_64|amd64)") elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86_64|amd64)")
set(HOST_X86_64 true) 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) set(HOST_I386 true)
elseif("${CMAKE_SYSTEM_NAME}" MATCHES "mips64") elseif("${CMAKE_SYSTEM_NAME}" MATCHES "mips64")
set(HOST_MIPS64 true) set(HOST_MIPS64 true)

3
scripts/test
View File

@ -115,10 +115,11 @@ elif [ "x$ARCH" = "xandroid" ]; then
echo "##### Date: `date`, Native API level: $NAL, ABI: $ABI" 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 rm -fr $build_dir include/openssl/opensslconf.h
mkdir $build_dir mkdir $build_dir
cd $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 \ cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja \
-DANDROID_NDK=$ANDROID_NDK_HOME \ -DANDROID_NDK=$ANDROID_NDK_HOME \
-DCMAKE_TOOLCHAIN_FILE=$TC_FILE \ -DCMAKE_TOOLCHAIN_FILE=$TC_FILE \