diff options
| author | cyan <cyjan@mrcyjanek.net> | 2024-08-14 09:58:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-14 09:58:27 +0200 |
| commit | 6948e084134fffcdce688f598598b1ee6f736715 (patch) | |
| tree | aacbf723ce342e9697eb5bd28a4177aec1f15699 /build_single.sh | |
| parent | 2ccb12e2ed51617a91f5f5f2e30b5d8ba9bf52d0 (diff) | |
| parent | 5de323b1ba7387cf73973042f06383d4dbe619f5 (diff) | |
Merge branch 'master' into cyjan-fix_cakewallet_buildcyjan-fix_cakewallet_build
Diffstat (limited to 'build_single.sh')
| -rwxr-xr-x | build_single.sh | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/build_single.sh b/build_single.sh index d98af2a..a8368da 100755 --- a/build_single.sh +++ b/build_single.sh @@ -2,6 +2,15 @@ cd "$(realpath $(dirname $0))" +proccount=1 +if [[ "x$(uname)" == "xDarwin" ]]; +then + proccount=$(sysctl -n hw.physicalcpu) +elif [[ "x$(uname)" == "xLinux" ]]; +then + proccount=$(nproc) +fi + function verbose_copy() { echo "==> cp $1 $2" cp $1 $2 @@ -11,13 +20,13 @@ set -e repo=$1 if [[ "x$repo" == "x" ]]; then - echo "Usage: $0 monero/wownero $(gcc -dumpmachine) -j$(nproc)" + echo "Usage: $0 monero/wownero $(gcc -dumpmachine) -j$proccount" exit 1 fi if [[ "x$repo" != "xwownero" && "x$repo" != "xmonero" ]]; then - echo "Usage: $0 monero/wownero $(gcc -dumpmachine) -j$(nproc)" + echo "Usage: $0 monero/wownero $(gcc -dumpmachine) -j$proccount" echo "Invalid target given, only monero and wownero are supported targets" fi @@ -31,7 +40,7 @@ fi HOST_ABI="$2" if [[ "x$HOST_ABI" == "x" ]]; then - echo "Usage: $0 monero/wownero $(gcc -dumpmachine) -j$(nproc)" + echo "Usage: $0 monero/wownero $(gcc -dumpmachine) -j$proccount" exit 1 fi @@ -39,7 +48,7 @@ NPROC="$3" if [[ "x$NPROC" == "x" ]]; then - echo "Usage: $0 monero/wownero $(gcc -dumpmachine) -j$(nproc)" + echo "Usage: $0 monero/wownero $(gcc -dumpmachine) -j$proccount" exit 1 fi cd $(dirname $0) @@ -181,20 +190,19 @@ pushd $repo/contrib/depends make $NPROC popd fi - pushd ../../../external/macos - ./build_unbound.sh - popd MACOS_LIBS_DIR="${PWD}/${HOST_ABI}" rm -rf ${MACOS_LIBS_DIR} mkdir -p ${MACOS_LIBS_DIR}/lib - if [[ "x$HOMEBREW_PREFIX" == "x" ]]; + if [[ "$(uname -m)" == "arm64" ]]; then - export HOMEBREW_PREFIX=/opt/homebrew - if [[ ! -d "$HOMEBREW_PREFIX" ]]; - then - export HOMEBREW_PREFIX=/usr/local - fi + export HOMEBREW_PREFIX="/opt/homebrew" + elif [[ "$(uname -m)" == "x86_64" ]]; + then + export HOMEBREW_PREFIX="/usr/local" fi + pushd ../../../external/macos + ./build_unbound.sh + popd # NOTE: we can use unbound from brew but app store rejects the app because of nghttp2 symbols being included # verbose_copy "${HOMEBREW_PREFIX}/lib/libunbound.a" ${MACOS_LIBS_DIR}/lib/libunbound.a verbose_copy "../../../external/macos/build/MACOS/lib/libunbound.a" ${MACOS_LIBS_DIR}/lib/libunbound.a |