Skip to content

Commit 7307a6a

Browse files
authored
Merge pull request #218 from wolfSSL/macos-IDE-test
Fix OOM error with macos IDE/XCODE
2 parents 5f8c425 + 671591f commit 7307a6a

1 file changed

Lines changed: 16 additions & 8 deletions

File tree

IDE/XCODE/build-openssl-framework.sh

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ build() { # <ARCH=arm64|x86_64> <TYPE=iphonesimulator|iphoneos|macosx|watchos|wa
6767
mkdir -p ${OUTDIR}/${TYPE}-${ARCH} && cd ${OUTDIR}/${TYPE}-${ARCH}
6868

6969
CC="clang" CXX="clang" CFLAGS="${CFLAGS_COMMON} -Os -arch ${ARCH} -isysroot ${SDK_ROOT}" LDFLAGS="-arch ${ARCH} -isysroot ${SDK_ROOT}" ${WOLFSSL_DIR}/Configure no-asm ${TARGET} --prefix=${OUTDIR}/openssl-install-${TYPE}-${ARCH} ${CONF_OPTS}
70-
make -j${NUMCPU}
70+
make -j$((${NUMCPU} / 2))
7171
make install
7272

7373
popd
@@ -80,10 +80,15 @@ for type in iphonesimulator macosx ; do
8080
build x86_64 ${type}
8181

8282
# Create universal binaries from architecture-specific static libraries
83-
lipo \
84-
"$OUTDIR/openssl-install-${type}-x86_64/lib/libssl.a" \
85-
"$OUTDIR/openssl-install-${type}-arm64/lib/libssl.a" \
86-
-create -output $LIPODIR/libopenssl-${type}.a
83+
if [ -f "$OUTDIR/openssl-install-${type}-x86_64/lib/libssl.a" ] && [ -f "$OUTDIR/openssl-install-${type}-arm64/lib/libssl.a" ]; then
84+
lipo \
85+
"$OUTDIR/openssl-install-${type}-x86_64/lib/libssl.a" \
86+
"$OUTDIR/openssl-install-${type}-arm64/lib/libssl.a" \
87+
-create -output $LIPODIR/libopenssl-${type}.a
88+
else
89+
echo "ERROR: Required input libraries not found for ${type}"
90+
exit 1
91+
fi
8792

8893
echo "Checking libraries"
8994
xcrun -sdk ${type} lipo -info $LIPODIR/libopenssl-${type}.a
@@ -94,9 +99,12 @@ for type in iphoneos ; do
9499
build arm64 ${type}
95100

96101
# Create universal binaries from architecture-specific static libraries
97-
lipo \
98-
"$OUTDIR/openssl-install-${type}-arm64/lib/libssl.a" \
99-
-create -output $LIPODIR/libopenssl-${type}.a
102+
if [ -f "$OUTDIR/openssl-install-${type}-arm64/lib/libssl.a" ]; then
103+
cp "$OUTDIR/openssl-install-${type}-arm64/lib/libssl.a" "$LIPODIR/libopenssl-${type}.a"
104+
else
105+
echo "ERROR: Required input library not found for ${type}"
106+
exit 1
107+
fi
100108

101109
echo "Checking libraries"
102110
xcrun -sdk ${type} lipo -info $LIPODIR/libopenssl-${type}.a

0 commit comments

Comments
 (0)