Merge branch 'PEMA-192'

master
Dirk Zimmermann 5 days ago
commit 4ac5d926b1

@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IOS_DEPLOYMENT</key>
<string>12.0</string>
<string>13.0</string>
<key>MACOSX_DEPLOYMENT_x86_64</key>
<string>10.10</string>
<key>MACOSX_DEPLOYMENT_M1</key>

@ -1,6 +1,6 @@
# common-dependency-build-helpers-4-apple-hardware
Contains one macOS build script for each dependency and an Xcode project with convenience build aggragates (using the build scripts).
Contains one macOS build script for each dependency and an Xcode project with convenience build aggregates (using the build scripts).
## Prerequisites

@ -30,7 +30,6 @@ mkdir -p "${INCLUDE_DIR}"
mkdir -p "${LIB_DIR}"
mkdir -p "${TMP_DIR}"
IOS_DEPLOYMENT_TARGET=$(sh "${SCRIPT_DIR}"/get-config-ios-deployment-target.sh)
# Funcs

@ -14,7 +14,19 @@ PKG_CONFIG_PATH=$OUTPUT_DIR/${ARCH}/lib/pkgconfig
build_ios()
{
PKG_CONFIG_ALLOW_CROSS=1 RUST_BACKTRACE=1 PKG_CONFIG_PATH=$PKG_CONFIG_PATH RUSTFLAGS="-L ${PREFIX}/lib" cargo build --package sequoia-openpgp-ffi --target ${TARGET} --release
unset SDKROOT # PEMA-192
PKG_CONFIG_ALLOW_CROSS=1 \
RUST_BACKTRACE=1 \
PKG_CONFIG_PATH="$PKG_CONFIG_PATH" \
RUSTFLAGS="-L ${PREFIX}/lib" \
ARCH="$ARCH" \
TARGET="$TARGET" \
HOST="$HOST" \
SDK="$SDK" \
SDK_PATH="$SDK_PATH" \
CFLAGS="$CFLAGS" \
cargo build --package sequoia-openpgp-ffi --target ${TARGET} --release
# copy artefacts
cp "${SEQUOIA_DIR}/target/${TARGET}/release"/*.a "${CURRENT_LIB_DIR}/lib"
}

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save