fix universal build (#1621)
cyan committed
Aug 18, 2024 at 14:25 UTC
4071e460f687d4fe2e72368dfd3ed5a30ca2ca1f
1 file changed
+14
-10
scripts/macos/build_monero_all.sh
+14
-10
@@ -23,12 +23,14 @@ then
23
done
24
else
25
if [[ "x$1" == "xuniversal" ]]; then
26
- ARCHS=(arm64 x86_64)
26
+ ARCHS=(x86_64 arm64)
27
else
28
ARCHS=$(uname -m)
29
fi
30
for COIN in monero wownero;
31
do
32
+ MONERO_LIBS=""
33
+ WOWNERO_LIBS=""
34
for ARCH in "${ARCHS[@]}";
35
do
36
if [[ "$ARCH" == "arm64" ]]; then
@@ -39,17 +41,19 @@ else
41
HOST="${ARCH}-host-apple-darwin"
42
fi
43
42
- MONERO_LIBS=" -arch ${ARCH} ${MONEROC_RELEASE_DIR}/${HOST}_libwallet2_api_c.dylib"
43
- WOWNERO_LIBS=" -arch ${ARCH} ${WOWNEROC_RELEASE_DIR}/${HOST}_libwallet2_api_c.dylib"
44
+ MONERO_LIBS="$MONERO_LIBS -arch ${ARCH} ${MONEROC_RELEASE_DIR}/${HOST}_libwallet2_api_c.dylib"
45
+ WOWNERO_LIBS="$WOWNERO_LIBS -arch ${ARCH} ${WOWNEROC_RELEASE_DIR}/${HOST}_libwallet2_api_c.dylib"
46
45
- if [[ ! $(uname -m) == $ARCH ]]; then
46
- PRC="arch -${ARCH}"
47
- fi
47
+ if [[ ! $(uname -m) == $ARCH ]]; then
48
+ PRC="arch -${ARCH}"
49
+ else
50
+ PRC=""
51
+ fi
52
49
- pushd ../monero_c
50
- $PRC ./build_single.sh ${COIN} ${HOST} $NPROC
51
- unxz -f ./release/${COIN}/${HOST}_libwallet2_api_c.dylib.xz
52
- popd
53
+ pushd ../monero_c
54
+ $PRC ./build_single.sh ${COIN} ${HOST} $NPROC
55
+ unxz -f ./release/${COIN}/${HOST}_libwallet2_api_c.dylib.xz
56
+ popd
57
done
58
done
59
fi