diff --git a/README.md b/README.md index 7d5cab7..0b736f7 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ git submodule init git submodule update ./build_gmp.sh android mkdir build_prover_android && cd build_prover_android -cmake .. -DTARGET_PLATFORM=ANDROID -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../package_android +cmake .. -DTARGET_PLATFORM=ANDROID -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../package_android -DBUILD_TESTS=OFF make -j4 && make install ``` diff --git a/build_gmp.sh b/build_gmp.sh index 8f1b380..a11ab98 100755 --- a/build_gmp.sh +++ b/build_gmp.sh @@ -128,7 +128,11 @@ build_android() return 1 fi - export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64 + if [ "$(uname)" == "Darwin" ]; then + export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/darwin-x86_64 + else + export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64 + fi export TARGET=aarch64-linux-android export API=21 @@ -173,7 +177,11 @@ build_android_x86_64() return 1 fi - export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64 + if [ "$(uname)" == "Darwin" ]; then + export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/darwin-x86_64 + else + export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64 + fi export TARGET=x86_64-linux-android export API=21 diff --git a/cmake/platform.cmake b/cmake/platform.cmake index 582f26b..ddbc1d4 100644 --- a/cmake/platform.cmake +++ b/cmake/platform.cmake @@ -79,7 +79,7 @@ else() endif() -if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin") +if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin" AND NOT TARGET_PLATFORM MATCHES "^android(_x86_64)?") set(GMP_DEFINIONS -D_LONG_LONG_LIMB) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ae06919..caeed4a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,7 @@ endif() if(USE_ASM AND ARCH MATCHES "x86_64") - if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin") + if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin" AND NOT TARGET_PLATFORM MATCHES "^android(_x86_64)?") set(NASM_FLAGS -fmacho64 --prefix _) else() set(NASM_FLAGS -felf64 -DPIC)