Skip to content

Commit 0480d30

Browse files
fix arch armv4t being passed to linker when building boost.locale for iOS and tvOS
1 parent 19a1280 commit 0480d30

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

683683
patchBoost()
684684
{
685+
BOOST_BUILD_DIR="$BOOST_SRC/tools/build"
685686
if [ "$(version "$BOOST_VERSION")" -le "$(version "1.73.0")" ] &&
686687
[ "$(version "$XCODE_VERSION")" -ge "$(version "11.4")" ]
687688
then
688689
echo "Patching boost in $BOOST_SRC"
689690

690691
# https://github.com/boostorg/build/pull/560
691-
(cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_SRC/tools/build" < "$CURRENT_DIR/patches/xcode-11.4.patch")
692+
(cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_BUILD_DIR" < "$CURRENT_DIR/patches/xcode-11.4.patch")
692693

693694
doneSection
694695
fi
696+
697+
# fixes boost passing `-arch arm` to linker which fails due to attempt to use armv4t
698+
sed -i '' -e "s/options = -arch arm ;/#options = -arch arm ;/" "$BOOST_BUILD_DIR/src/tools/darwin.jam"
695699
}
696700

697701
#===============================================================================

0 commit comments

Comments
 (0)