Skip to content

Commit f6dd16d

Browse files
fix arch armv4t being passed to linker when building boost.locale for iOS and tvOS
1 parent 18d7d5d commit f6dd16d

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

boost.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,16 +704,20 @@ unpackBoost()
704704

705705
patchBoost()
706706
{
707+
BOOST_BUILD_DIR="$BOOST_SRC/tools/build"
707708
if [ "$(version "$BOOST_VERSION")" -le "$(version "1.73.0")" ] &&
708709
[ "$(version "$XCODE_VERSION")" -ge "$(version "11.4")" ]
709710
then
710711
echo "Patching boost in $BOOST_SRC"
711712

712713
# https://github.com/boostorg/build/pull/560
713-
(cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_SRC/tools/build" < "$CURRENT_DIR/patches/xcode-11.4.patch")
714+
(cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_BUILD_DIR" < "$CURRENT_DIR/patches/xcode-11.4.patch")
714715

715716
doneSection
716717
fi
718+
719+
# fixes boost passing `-arch arm` to linker which fails due to attempt to use armv4t
720+
sed -i '' -e "s/options = -arch arm ;/#options = -arch arm ;/" "$BOOST_BUILD_DIR/src/tools/darwin.jam"
717721
}
718722

719723
#===============================================================================

0 commit comments

Comments
 (0)