File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -704,16 +704,20 @@ unpackBoost()
704704
705705patchBoost ()
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# ===============================================================================
You can’t perform that action at this time.
0 commit comments