fix MAKE_JOB_COUNT on darwin, and use it on ios and macos scripts (#1981)
cyan committed
Jan 28, 2025 at 13:22 UTC
c3c5c8644cae5d8ae0eb94eb9332d8881b020d83
3 files changed
+3
-3
scripts/functions.sh
+1
-1
@@ -26,7 +26,7 @@ then
26
export MAKE_JOB_COUNT="$(expr $(printf '%s\n%s' $(( $(grep MemTotal: /proc/meminfo | cut -d: -f2 | cut -dk -f1) * 4 / (1048576 * 9) )) $(nproc) | sort -n | head -n1) '|' 1)"
27
elif [[ "$(uname)" == "Darwin" ]];
28
then
29
- export MAKE_JOB_COUNT="(expr $(printf '%s\n%s' $(( $(sysctl -n hw.memsize) * 4 / (1073741824 * 9) )) $(sysctl -n hw.logicalcpu) | sort -n | head -n1) '|' 1)"
29
+ export MAKE_JOB_COUNT="$(expr $(printf '%s\n%s' $(( $(sysctl -n hw.memsize) * 4 / (1073741824 * 9) )) $(sysctl -n hw.logicalcpu) | sort -n | head -n1) '|' 1)"
30
else
31
# Assume windows eh?
32
export MAKE_JOB_COUNT="$(expr $(printf '%s\n%s' $(( $(grep MemTotal: /proc/meminfo | cut -d: -f2 | cut -dk -f1) * 4 / (1048576 * 9) )) $(nproc) | sort -n | head -n1) '|' 1)"
scripts/ios/build_monero_all.sh
+1
-1
@@ -19,7 +19,7 @@ for COIN in monero wownero zano;
19
do
20
pushd ../monero_c
21
rm -rf external/ios/build
22
- ./build_single.sh ${COIN} aarch64-apple-ios -j$NPROC
22
+ ./build_single.sh ${COIN} aarch64-apple-ios -j$MAKE_JOB_COUNT
23
popd
24
done
25
scripts/macos/build_monero_all.sh
+1
-1
@@ -39,7 +39,7 @@ else
39
WOWNERO_LIBS="$WOWNERO_LIBS -arch ${ARCH} ${WOWNEROC_RELEASE_DIR}/${HOST}_libwallet2_api_c.dylib"
40
41
pushd ../monero_c
42
- ./build_single.sh ${COIN} ${HOST} $NPROC
42
+ ./build_single.sh ${COIN} ${HOST} -j$MAKE_JOB_COUNT
43
unxz -f ./release/${COIN}/${HOST}_libwallet2_api_c.dylib.xz
44
popd
45
done