From d96991a4feca72d5ecea6c72c84dd6df5cc3d2d3 Mon Sep 17 00:00:00 2001 From: fuwa Date: Sun, 18 Apr 2021 10:57:53 +0800 Subject: [PATCH] use ninja build --- etc/nix/shell.nix | 1 + etc/scripts/build-external-libs/lolnero/build.sh | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/etc/nix/shell.nix b/etc/nix/shell.nix index 47073cf..f8ea3ae 100644 --- a/etc/nix/shell.nix +++ b/etc/nix/shell.nix @@ -158,6 +158,7 @@ with nixpkgs; ccache python2 + ninja ] ++ android-studio-deps ) diff --git a/etc/scripts/build-external-libs/lolnero/build.sh b/etc/scripts/build-external-libs/lolnero/build.sh index 0c5c983..e689c4a 100755 --- a/etc/scripts/build-external-libs/lolnero/build.sh +++ b/etc/scripts/build-external-libs/lolnero/build.sh @@ -73,9 +73,12 @@ for arch in ${archs[@]}; do pushd . cd build/release ( - CC="ccache $ccdir/aarch64-linux-android-clang" \ - CXX="ccache $ccdir/aarch64-linux-android-clang++" \ - cmake \ + CC="$ccdir/aarch64-linux-android-clang" \ + CXX="$ccdir/aarch64-linux-android-clang++" \ + cmake \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -G Ninja \ -DOPENSSL_INCLUDE_DIR=$PREFIX/include/openssl \ -DOPENSSL_CRYPTO_LIBRARY=$PREFIX/lib/libcrypto.a \ -DOPENSSL_SSL_LIBRARY=$PREFIX/lib/libssl.a \ @@ -92,7 +95,7 @@ for arch in ${archs[@]}; do -DCMAKE_TOOLCHAIN_FILE=${ndk_root}/build/cmake/android.toolchain.cmake \ -DANDROID_TOOLCHAIN=clang \ -DANDROID_NATIVE_API_LEVEL=28 \ - ../.. && make -j${NPROC} lolnerod + ../.. && ninja -j${NPROC} lolnerod ) popd