Skip to content

Commit 2606180

Browse files
fix arch armv4t being passed to linker when building boost.locale for iOS and tvOS
1 parent 7e30473 commit 2606180

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
@@ -688,16 +688,20 @@ unpackBoost()
688688

689689
patchBoost()
690690
{
691+
BOOST_BUILD_DIR="$BOOST_SRC/tools/build"
691692
if [ "$(version "$BOOST_VERSION")" -le "$(version "1.73.0")" ] &&
692693
[ "$(version "$XCODE_VERSION")" -ge "$(version "11.4")" ]
693694
then
694695
echo "Patching boost in $BOOST_SRC"
695696

696697
# https://github.com/boostorg/build/pull/560
697-
(cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_SRC/tools/build" < "$CURRENT_DIR/patches/xcode-11.4.patch")
698+
(cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_BUILD_DIR" < "$CURRENT_DIR/patches/xcode-11.4.patch")
698699

699700
doneSection
700701
fi
702+
703+
# fixes boost passing `-arch arm` to linker which fails due to attempt to use armv4t
704+
sed -i '' -e "s/options = -arch arm ;/#options = -arch arm ;/" "$BOOST_BUILD_DIR/src/tools/darwin.jam"
701705
}
702706

703707
#===============================================================================

0 commit comments

Comments
 (0)