Skip to content

Commit

Permalink
also use ios64 perlasm scheme for macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
Fsu0413 committed Feb 11, 2024
1 parent 71cb09e commit d10da57
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:
run: |
mkdir -p "build"
cd "build"
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/openssl${{ env.FS_OPENSSL_VERSION_STR }}-${{ env.FS_OPENSSL_PACKAGE_STR }}" -DCMAKE_OSX_ARCHITECTURES="arm64" -DOPENSSL_ASM=OFF -DOPENSSL_ZLIB=ON -DOPENSSL_THREADS=ON "${{ github.workspace }}/openssl-externalCMake"
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/openssl${{ env.FS_OPENSSL_VERSION_STR }}-${{ env.FS_OPENSSL_PACKAGE_STR }}" -DCMAKE_OSX_ARCHITECTURES="arm64" -DOPENSSL_ASM=ON -DOPENSSL_ZLIB=ON -DOPENSSL_THREADS=ON "${{ github.workspace }}/openssl-externalCMake"
cmake --build . --parallel
cmake --build . --parallel -t package
- uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ foreach (_OPTION IN ITEMS hw hw-padlock asm err nasm)
string(CONCAT _OPTION_HELP "enable OpenSSL option " ${_OPTION})
if (_OPTION STREQUAL "asm")
# building ASM needs Perl
cmake_dependent_option("${_OPTION_STR}" "${_OPTION_HELP}" ON "Perl_FOUND;APPLE AND ( IOS AND OPENSSL_TARGET_ARCH MATCHES \"arm\") OR ( NOT IOS AND OPENSSL_TARGET_ARCH STREQUAL \"x64\" )" OFF)
cmake_dependent_option("${_OPTION_STR}" "${_OPTION_HELP}" ON "Perl_FOUND;APPLE AND ( IOS AND OPENSSL_TARGET_ARCH MATCHES \"arm\") OR ( NOT IOS AND NOT OPENSSL_TARGET_ARCH STREQUAL \"\" )" OFF)
elseif (_OPTION STREQUAL "nasm")
cmake_dependent_option("${_OPTION_STR}" "${_OPTION_HELP}" OFF "OPENSSL_ASM;MSVC" OFF)
else()
Expand Down
2 changes: 1 addition & 1 deletion crypto/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ if (OPENSSL_ASM OR OPENSSL_UPLINK)
elseif ( OPENSSL_TARGET_ARCH STREQUAL "arm64" )
if ( ANDROID OR LINUX OR BSD )
set(OPENSSL_PERLASM_SCHEME "linux64")
elseif (IOS)
elseif (APPLE)
set(OPENSSL_PERLASM_SCHEME "ios64")
endif()
endif()
Expand Down

0 comments on commit d10da57

Please sign in to comment.