diff --git a/boost.sh b/boost.sh
index aa05571e..959bd3f6 100755
--- a/boost.sh
+++ b/boost.sh
@@ -704,16 +704,20 @@ unpackBoost()
 
 patchBoost()
 {
+    BOOST_BUILD_DIR="$BOOST_SRC/tools/build"
     if [ "$(version "$BOOST_VERSION")" -le "$(version "1.73.0")" ] &&
        [ "$(version "$XCODE_VERSION")" -ge "$(version "11.4")" ]
     then
         echo "Patching boost in $BOOST_SRC"
 
         # https://github.com/boostorg/build/pull/560
-        (cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_SRC/tools/build" < "$CURRENT_DIR/patches/xcode-11.4.patch")
+        (cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_BUILD_DIR" < "$CURRENT_DIR/patches/xcode-11.4.patch")
 
         doneSection
     fi
+
+    # fixes boost passing `-arch arm` to linker which fails due to attempt to use armv4t
+    sed -i '' -e "s/options = -arch arm ;/#options = -arch arm ;/" "$BOOST_BUILD_DIR/src/tools/darwin.jam"
 }
 
 #===============================================================================
@@ -741,14 +745,20 @@ updateBoostUserConfigJam()
         USING_MPI="using mpi ;" # trailing space needed
     fi
 
+    COMMON_FLAGS_IOS="$OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH"
+    COMMON_FLAGS_IOS_SIM="$OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH"
+
+    COMMON_FLAGS_TVOS="$OTHER_FLAGS ${TVOS_ARCH_FLAGS[*]} $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH"
+    COMMON_FLAGS_TVOS_SIM="$OTHER_FLAGS ${TVOS_SIM_ARCH_FLAGS[*]} $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH"
+
     cat > "$BOOST_SRC/tools/build/src/user-config.jam" <<EOF
 using darwin : $COMPILER_VERSION~iphone
 : $COMPILER
 : <architecture>arm
   <target-os>iphone
-  <cxxflags>"$CXX_FLAGS"
-  <linkflags>"$LD_FLAGS -isysroot $IOS_SDK_PATH"
-  <compileflags>"$OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH"
+  <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS"
+  <linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS"
+  <compileflags>"$COMMON_FLAGS_IOS"
   <threading>multi
 
 ;
@@ -756,27 +766,27 @@ using darwin : $COMPILER_VERSION~iphonesim
 : $COMPILER
 : <architecture>x86
   <target-os>iphone
-  <cxxflags>"$CXX_FLAGS"
-  <linkflags>"$LD_FLAGS -isysroot $IOSSIM_SDK_PATH"
-  <compileflags>"$OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH"
+  <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_IOS_SIM"
+  <linkflags>"$LD_FLAGS $COMMON_FLAGS_IOS_SIM"
+  <compileflags>"$COMMON_FLAGS_IOS_SIM"
   <threading>multi
 ;
 using darwin : $COMPILER_VERSION~appletv
 : $COMPILER
 : <architecture>arm
   <target-os>iphone
-  <cxxflags>"$CXX_FLAGS"
-  <linkflags>"$LD_FLAGS -isysroot $TVOS_SDK_PATH"
-  <compileflags>"$OTHER_FLAGS ${TVOS_ARCH_FLAGS[*]} $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH"
+  <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS"
+  <linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS"
+  <compileflags>"$COMMON_FLAGS_TVOS"
   <threading>multi
 ;
 using darwin : $COMPILER_VERSION~appletvsim
 : $COMPILER
 : <architecture>x86
   <target-os>iphone
-  <cxxflags>"$CXX_FLAGS"
-  <linkflags>"$LD_FLAGS -isysroot $TVOSSIM_SDK_PATH"
-  <compileflags>"$OTHER_FLAGS ${TVOS_SIM_ARCH_FLAGS[*]} $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH"
+  <cxxflags>"$CXX_FLAGS $COMMON_FLAGS_TVOS_SIM"
+  <linkflags>"$LD_FLAGS $COMMON_FLAGS_TVOS_SIM"
+  <compileflags>"$COMMON_FLAGS_TVOS_SIM"
   <threading>multi
 ;
 using darwin : $COMPILER_VERSION~macos