Skip to content

Commit 2a70b14

Browse files
committed
Merge branch 'master' of https://github.com/faithfracture/Apple-Boost-BuildScript into feature/silicon
2 parents 89ab33f + 1878bd3 commit 2a70b14

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

boost.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#
3232
#===============================================================================
3333

34-
BOOST_VERSION=1.72.0
34+
BOOST_VERSION=1.73.0
3535

3636
BOOST_LIBS="atomic chrono date_time exception filesystem program_options random system thread test"
3737
ALL_BOOST_LIBS_1_68="atomic chrono container context coroutine coroutine2
@@ -621,16 +621,16 @@ unpackBoost()
621621

622622
patchBoost()
623623
{
624-
echo "Patching boost in $BOOST_SRC"
625-
626-
if [ "$(version "$BOOST_VERSION")" -le "$(version "1.72.0")" ] &&
624+
if [ "$(version "$BOOST_VERSION")" -le "$(version "1.73.0")" ] &&
627625
[ "$(version "$XCODE_VERSION")" -ge "$(version "11.4")" ]
628626
then
627+
echo "Patching boost in $BOOST_SRC"
628+
629629
# https://github.com/boostorg/build/pull/560
630630
(cd "$BOOST_SRC" && patch --forward -p1 -d "$BOOST_SRC/tools/build" < "$CURRENT_DIR/patches/xcode-11.4.patch")
631-
fi
632631

633-
doneSection
632+
doneSection
633+
fi
634634
}
635635

636636
#===============================================================================
@@ -640,9 +640,11 @@ inventMissingHeaders()
640640
# These files are missing in the ARM iPhoneOS SDK, but they are in the simulator.
641641
# They are supported on the device, so we copy them from x86 SDK to a staging area
642642
# to use them on ARM, too.
643-
echo Invent missing headers
643+
echo "Inventing missing headers"
644644

645645
cp "$XCODE_ROOT/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IOS_SDK_VERSION}.sdk/usr/include/"{crt_externs,bzlib}.h "$BOOST_SRC"
646+
647+
doneSection
646648
}
647649

648650
#===============================================================================

0 commit comments

Comments
 (0)