fix universal build (#1621)

This commit is contained in:
cyan 2024-08-18 14:25:44 +02:00 committed by GitHub
parent fe4b3e4eb0
commit 4071e460f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -23,12 +23,14 @@ then
done done
else else
if [[ "x$1" == "xuniversal" ]]; then if [[ "x$1" == "xuniversal" ]]; then
ARCHS=(arm64 x86_64) ARCHS=(x86_64 arm64)
else else
ARCHS=$(uname -m) ARCHS=$(uname -m)
fi fi
for COIN in monero wownero; for COIN in monero wownero;
do do
MONERO_LIBS=""
WOWNERO_LIBS=""
for ARCH in "${ARCHS[@]}"; for ARCH in "${ARCHS[@]}";
do do
if [[ "$ARCH" == "arm64" ]]; then if [[ "$ARCH" == "arm64" ]]; then
@ -39,17 +41,19 @@ else
HOST="${ARCH}-host-apple-darwin" HOST="${ARCH}-host-apple-darwin"
fi fi
MONERO_LIBS=" -arch ${ARCH} ${MONEROC_RELEASE_DIR}/${HOST}_libwallet2_api_c.dylib" MONERO_LIBS="$MONERO_LIBS -arch ${ARCH} ${MONEROC_RELEASE_DIR}/${HOST}_libwallet2_api_c.dylib"
WOWNERO_LIBS=" -arch ${ARCH} ${WOWNEROC_RELEASE_DIR}/${HOST}_libwallet2_api_c.dylib" WOWNERO_LIBS="$WOWNERO_LIBS -arch ${ARCH} ${WOWNEROC_RELEASE_DIR}/${HOST}_libwallet2_api_c.dylib"
if [[ ! $(uname -m) == $ARCH ]]; then if [[ ! $(uname -m) == $ARCH ]]; then
PRC="arch -${ARCH}" PRC="arch -${ARCH}"
fi else
PRC=""
fi
pushd ../monero_c pushd ../monero_c
$PRC ./build_single.sh ${COIN} ${HOST} $NPROC $PRC ./build_single.sh ${COIN} ${HOST} $NPROC
unxz -f ./release/${COIN}/${HOST}_libwallet2_api_c.dylib.xz unxz -f ./release/${COIN}/${HOST}_libwallet2_api_c.dylib.xz
popd popd
done done
done done
fi fi