Merge pull request #5 from PeteClubSeven/bugfix/secp256-android-macos-failure

Fix libsecp256 not building for 64-bit Android on macOS

Author: giahuy98

contrib/bitcoin-core/CMakeLists.txt

@@ -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)