Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix libsecp256 not building for 64-bit Android on macOS #5

Merged
merged 1 commit into from
Jul 20, 2023
Merged

Fix libsecp256 not building for 64-bit Android on macOS #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion contrib/bitcoin-core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ if (NOT ${USE_EXTERNAL_SECP256K1})
add_library(libsecp256k1 STATIC IMPORTED)

# Ensure we use the lib folder for 32-bit and lib64 folder for 64-bit
if (${CMAKE_ANDROID_ARCH} MATCHES "^(arm|mips|x86)$")
# Note: macOS always outputs to a "lib" folder
if ((${CMAKE_ANDROID_ARCH} MATCHES "^(arm|mips|x86)$") OR (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin"))
set_target_properties(libsecp256k1 PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/src/secp256k1/build/android/${ANDROID_ABI}/lib/libsecp256k1.a)
else()
set_target_properties(libsecp256k1 PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/src/secp256k1/build/android/${ANDROID_ABI}/lib64/libsecp256k1.a)
Expand Down