Skip to content

Commit b18d88f

Browse files
guillaumealgisguillaumealgis
authored
Cleanup user-config.jam patch (#51)
* Cleanup user-config.jam darwin patch * Cleanup variables values dump at beginning of script
1 parent 56006cf commit b18d88f

File tree

2 files changed

+140
-91
lines changed

2 files changed

+140
-91
lines changed

‎boost.sh‎

Lines changed: 137 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,27 @@ system test thread timer type_erasure wave"
4343
BOOTSTRAP_LIBS=""
4444

4545
MIN_IOS_VERSION=11.0
46+
IOS_SDK_VERSION=$(xcrun --sdk iphoneos --show-sdk-version)
47+
IOS_SDK_PATH=$(xcrun --sdk iphoneos --show-sdk-path)
48+
IOSSIM_SDK_PATH=$(xcrun --sdk iphonesimulator --show-sdk-path)
4649

4750
MIN_TVOS_VERSION=11.0
51+
TVOS_SDK_VERSION=$(xcrun --sdk appletvos --show-sdk-version)
4852
TVOS_SDK_PATH=$(xcrun --sdk appletvos --show-sdk-path)
4953
TVOSSIM_SDK_PATH=$(xcrun --sdk appletvsimulator --show-sdk-path)
5054

5155
MIN_MACOS_VERSION=10.12
56+
MACOS_SDK_VERSION=$(xcrun --sdk macosx --show-sdk-version)
5257
MACOS_SDK_PATH=$(xcrun --sdk macosx --show-sdk-path)
5358

5459
MACOS_ARCHS=("x86_64")
5560
IOS_ARCHS=("armv7" "arm64")
5661
IOS_SIM_ARCHS=("i386" "x86_64")
5762

5863
# Applied to all platforms
59-
CXX_FLAGS="-std=c++14 -stdlib=libc++"
64+
CXX_FLAGS=""
65+
LD_FLAGS=""
66+
OTHER_FLAGS="-std=c++14 -stdlib=libc++ -DNDEBUG"
6067

6168
XCODE_VERSION=$(xcrun xcodebuild -version | head -n1 | tr -Cd '[:digit:].')
6269
XCODE_ROOT=$(xcode-select -print-path)
@@ -67,9 +74,9 @@ THREADS="-j$(sysctl -n hw.ncpu)"
6774
CURRENT_DIR=$(pwd)
6875
SRCDIR="$CURRENT_DIR/src"
6976

70-
IOS_ARM_DEV_CMD="xcrun --sdk iphoneos"
77+
IOS_DEV_CMD="xcrun --sdk iphoneos"
7178
IOS_SIM_DEV_CMD="xcrun --sdk iphonesimulator"
72-
TVOS_ARM_DEV_CMD="xcrun --sdk appletvos"
79+
TVOS_DEV_CMD="xcrun --sdk appletvos"
7380
TVOS_SIM_DEV_CMD="xcrun --sdk appletvsimulator"
7481
MACOS_DEV_CMD="xcrun --sdk macosx"
7582

@@ -596,48 +603,55 @@ updateBoost()
596603
USING_MPI="using mpi ;" # trailing space needed
597604
fi
598605

599-
if [[ "$1" == "iOS" ]]; then
600-
cat > "$BOOST_SRC/tools/build/src/user-config.jam" <<EOF
601-
using darwin : ${IOS_SDK_VERSION}~iphone
602-
: $COMPILER ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS
603-
: <striper> <root>$XCODE_ROOT/Platforms/iPhoneOS.platform/Developer
604-
: <architecture>arm <target-os>iphone
606+
cat > "$BOOST_SRC/tools/build/src/user-config.jam" <<EOF
607+
using darwin : $COMPILER_VERSION~iphone
608+
: $COMPILER
609+
: <architecture>arm
610+
<target-os>iphone
611+
<cxxflags>"$CXX_FLAGS"
612+
<linkflags>"$LD_FLAGS"
613+
<compileflags>"$OTHER_FLAGS ${IOS_ARCH_FLAGS[*]} $EXTRA_IOS_FLAGS -isysroot $IOS_SDK_PATH"
614+
<threading>multi
615+
605616
;
606-
using darwin : ${IOS_SDK_VERSION}~iphonesim
607-
: $COMPILER ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS
608-
: <striper> <root>$XCODE_ROOT/Platforms/iPhoneSimulator.platform/Developer
609-
: <architecture>x86 <target-os>iphone
617+
using darwin : $COMPILER_VERSION~iphonesim
618+
: $COMPILER
619+
: <architecture>x86
620+
<target-os>iphone
621+
<cxxflags>"$CXX_FLAGS"
622+
<linkflags>"$LD_FLAGS"
623+
<compileflags>"$OTHER_FLAGS ${IOS_SIM_ARCH_FLAGS[*]} $EXTRA_IOS_SIM_FLAGS -isysroot $IOSSIM_SDK_PATH"
624+
<threading>multi
610625
;
611-
$USING_MPI
612-
EOF
613-
fi
614-
615-
if [[ "$1" == "tvOS" ]]; then
616-
cat > "$BOOST_SRC/tools/build/src/user-config.jam" <<EOF
617-
using darwin : ${TVOS_SDK_VERSION}~appletv
618-
: $COMPILER -arch arm64 $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH -I $TVOS_SDK_PATH
619-
: <striper> <root>$XCODE_ROOT/Platforms/AppleTVOS.platform/Developer
620-
: <architecture>arm <target-os>iphone
626+
using darwin : $COMPILER_VERSION~appletv
627+
: $COMPILER
628+
: <architecture>arm
629+
<target-os>iphone
630+
<cxxflags>"$CXX_FLAGS"
631+
<linkflags>"$LD_FLAGS"
632+
<compileflags>"$OTHER_FLAGS -arch arm64 $EXTRA_TVOS_FLAGS -isysroot $TVOS_SDK_PATH"
633+
<threading>multi
621634
;
622-
using darwin : ${TVOS_SDK_VERSION}~appletvsim
623-
: $COMPILER -arch x86_64 $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH -I $TVOSSIM_SDK_PATH
624-
: <striper> <root>$XCODE_ROOT/Platforms/AppleTVSimulator.platform/Developer
625-
: <architecture>x86 <target-os>iphone
635+
using darwin : $COMPILER_VERSION~appletvsim
636+
: $COMPILER
637+
: <architecture>x86
638+
<target-os>iphone
639+
<cxxflags>"$CXX_FLAGS"
640+
<linkflags>"$LD_FLAGS"
641+
<compileflags>"$OTHER_FLAGS -arch x86_64 $EXTRA_TVOS_SIM_FLAGS -isysroot $TVOSSIM_SDK_PATH"
642+
<threading>multi
626643
;
627-
$USING_MPI
628-
EOF
629-
fi
630-
631-
if [[ "$1" == "macOS" ]]; then
632-
cat > "$BOOST_SRC/tools/build/src/user-config.jam" <<EOF
633-
using darwin : ${MACOS_SDK_VERSION}
634-
: $COMPILER ${MACOS_ARCH_FLAGS[*]} $EXTRA_MACOS_FLAGS -isysroot $MACOS_SDK_PATH
635-
: <striper> <root>$XCODE_ROOT/Platforms/MacOSX.platform/Developer
636-
: <architecture>x86 <target-os>darwin
644+
using darwin : $COMPILER_VERSION~macos
645+
: $COMPILER
646+
: <architecture>x86
647+
<target-os>darwin
648+
<cxxflags>"$CXX_FLAGS"
649+
<linkflags>"$LD_FLAGS"
650+
<compileflags>"$OTHER_FLAGS ${MACOS_ARCH_FLAGS[*]} $EXTRA_MACOS_FLAGS -isysroot $MACOS_SDK_PATH"
651+
<threading>multi
637652
;
638653
$USING_MPI
639654
EOF
640-
fi
641655

642656
doneSection
643657
}
@@ -689,29 +703,37 @@ buildBoost_iOS()
689703

690704
echo Building Boost for iPhone
691705
# Install this one so we can copy the headers for the frameworks...
692-
./b2 "$THREADS" --build-dir=iphone-build --stagedir=iphone-build/stage \
693-
--prefix="$IOS_OUTPUT_DIR/prefix" toolset=darwin \
694-
cxxflags="${CXX_FLAGS} ${IOS_ARCH_FLAGS[*]}" architecture=arm target-os=iphone linkflags="-stdlib=libc++" \
695-
macosx-version="iphone-$IOS_SDK_VERSION" define=_LITTLE_ENDIAN \
696-
link=static variant=${BUILD_VARIANT} stage >> "${IOS_OUTPUT_DIR}/ios-build.log" 2>&1
706+
./b2 "$THREADS" \
707+
--build-dir=iphone-build \
708+
--stagedir=iphone-build/stage \
709+
--prefix="$IOS_OUTPUT_DIR/prefix" \
710+
toolset="darwin-$COMPILER_VERSION~iphone" \
711+
link=static \
712+
variant=${BUILD_VARIANT} \
713+
stage >> "${IOS_OUTPUT_DIR}/ios-build.log" 2>&1
697714
# shellcheck disable=SC2181
698715
if [ $? != 0 ]; then echo "Error staging iPhone. Check log."; exit 1; fi
699716

700-
./b2 "$THREADS" --build-dir=iphone-build --stagedir=iphone-build/stage \
701-
--prefix="$IOS_OUTPUT_DIR/prefix" toolset=darwin \
702-
cxxflags="${CXX_FLAGS} ${IOS_ARCH_FLAGS[*]}" architecture=arm linkflags="-stdlib=libc++" \
703-
target-os=iphone macosx-version="iphone-$IOS_SDK_VERSION" \
704-
define=_LITTLE_ENDIAN link=static variant=${BUILD_VARIANT} install >> "${IOS_OUTPUT_DIR}/ios-build.log" 2>&1
717+
./b2 "$THREADS" \
718+
--build-dir=iphone-build \
719+
--stagedir=iphone-build/stage \
720+
--prefix="$IOS_OUTPUT_DIR/prefix" \
721+
toolset="darwin-$COMPILER_VERSION~iphone" \
722+
link=static \
723+
variant=${BUILD_VARIANT} \
724+
install >> "${IOS_OUTPUT_DIR}/ios-build.log" 2>&1
705725
# shellcheck disable=SC2181
706726
if [ $? != 0 ]; then echo "Error installing iPhone. Check log."; exit 1; fi
707727
doneSection
708728

709729
echo Building Boost for iPhoneSimulator
710-
./b2 "$THREADS" --build-dir=iphonesim-build --stagedir=iphonesim-build/stage \
711-
toolset="darwin-{IOS_SDK_VERSION}~iphonesim" \
712-
cxxflags="${CXX_FLAGS} ${IOS_SIM_ARCH_FLAGS[*]}" architecture=x86 linkflags="-stdlib=libc++" \
713-
target-os=iphone macosx-version="iphonesim-$IOS_SDK_VERSION" \
714-
link=static variant=${BUILD_VARIANT} stage >> "${IOS_OUTPUT_DIR}/ios-build.log" 2>&1
730+
./b2 "$THREADS" \
731+
--build-dir=iphonesim-build \
732+
--stagedir=iphonesim-build/stage \
733+
toolset="darwin-$COMPILER_VERSION~iphonesim" \
734+
link=static \
735+
variant=${BUILD_VARIANT} \
736+
stage >> "${IOS_OUTPUT_DIR}/ios-build.log" 2>&1
715737
# shellcheck disable=SC2181
716738
if [ $? != 0 ]; then echo "Error staging iPhoneSimulator. Check log."; exit 1; fi
717739
doneSection
@@ -723,25 +745,37 @@ buildBoost_tvOS()
723745
mkdir -p "$TVOS_OUTPUT_DIR"
724746

725747
echo Building Boost for AppleTV
726-
./b2 "$THREADS" --build-dir=appletv-build --stagedir=appletv-build/stage \
727-
--prefix="$TVOS_OUTPUT_DIR/prefix" toolset="darwin-$TVOS_SDK_VERSION~appletv" \
728-
cxxflags="${CXX_FLAGS}" architecture=arm target-os=iphone define=_LITTLE_ENDIAN linkflags="-stdlib=libc++" \
729-
link=static variant=${BUILD_VARIANT} stage >> "${TVOS_OUTPUT_DIR}/tvos-build.log" 2>&1
748+
./b2 "$THREADS" \
749+
--build-dir=appletv-build \
750+
--stagedir=appletv-build/stage \
751+
--prefix="$TVOS_OUTPUT_DIR/prefix" \
752+
toolset="darwin-$COMPILER_VERSION~appletv" \
753+
link=static \
754+
variant=${BUILD_VARIANT} \
755+
stage >> "${TVOS_OUTPUT_DIR}/tvos-build.log" 2>&1
730756
# shellcheck disable=SC2181
731757
if [ $? != 0 ]; then echo "Error staging AppleTV. Check log."; exit 1; fi
732758

733-
./b2 "$THREADS" --build-dir=appletv-build --stagedir=appletv-build/stage \
734-
--prefix="$TVOS_OUTPUT_DIR/prefix" toolset="darwin-$TVOS_SDK_VERSION~appletv" \
735-
cxxflags="${CXX_FLAGS}" architecture=arm target-os=iphone define=_LITTLE_ENDIAN linkflags="-stdlib=libc++" \
736-
link=static variant=${BUILD_VARIANT} install >> "${TVOS_OUTPUT_DIR}/tvos-build.log" 2>&1
759+
./b2 "$THREADS" \
760+
--build-dir=appletv-build \
761+
--stagedir=appletv-build/stage \
762+
--prefix="$TVOS_OUTPUT_DIR/prefix" \
763+
toolset="darwin-$COMPILER_VERSION~appletv" \
764+
link=static \
765+
variant=${BUILD_VARIANT} \
766+
install >> "${TVOS_OUTPUT_DIR}/tvos-build.log" 2>&1
737767
# shellcheck disable=SC2181
738768
if [ $? != 0 ]; then echo "Error installing AppleTV. Check log."; exit 1; fi
739769
doneSection
740770

741-
echo Building Boost for AppleTVSimulator
742-
./b2 "$THREADS" --build-dir=appletv-build --stagedir=appletvsim-build/stage \
743-
toolset="darwin-$TVOS_SDK_VERSION~appletvsim" architecture=x86 \
744-
cxxflags="${CXX_FLAGS}" target-os=iphone link=static variant=${BUILD_VARIANT} linkflags="-stdlib=libc++" \
771+
echo "Building Boost for AppleTVSimulator"
772+
./b2 "$THREADS" \
773+
--build-dir=appletvsim-build \
774+
--stagedir=appletvsim-build/stage \
775+
--prefix="$TVOS_OUTPUT_DIR/prefix" \
776+
toolset="darwin-$COMPILER_VERSION~appletvsim" \
777+
link=static \
778+
variant=${BUILD_VARIANT} \
745779
stage >> "${TVOS_OUTPUT_DIR}/tvos-build.log" 2>&1
746780
# shellcheck disable=SC2181
747781
if [ $? != 0 ]; then echo "Error staging AppleTVSimulator. Check log."; exit 1; fi
@@ -754,19 +788,25 @@ buildBoost_macOS()
754788
mkdir -p "$MACOS_OUTPUT_DIR"
755789

756790
echo building Boost for macOS
757-
./b2 "$THREADS" --build-dir=macos-build --stagedir=macos-build/stage --prefix="$MACOS_OUTPUT_DIR/prefix" \
758-
toolset="darwin-$MACOS_SDK_VERSION" architecture=x86 \
759-
cxxflags="${CXX_FLAGS} ${MACOS_ARCH_FLAGS[*]} ${EXTRA_MACOS_SDK_FLAGS}" \
760-
linkflags="-stdlib=libc++ ${EXTRA_MACOS_SDK_FLAGS}" link=static variant=${BUILD_VARIANT} threading=multi \
761-
macosx-version="${MACOS_SDK_VERSION}" stage >> "${MACOS_OUTPUT_DIR}/macos-build.log" 2>&1
791+
./b2 "$THREADS" \
792+
--build-dir=macos-build \
793+
--stagedir=macos-build/stage \
794+
--prefix="$MACOS_OUTPUT_DIR/prefix" \
795+
toolset="darwin-$COMPILER_VERSION~macos" \
796+
link=static \
797+
variant=${BUILD_VARIANT} \
798+
stage >> "${MACOS_OUTPUT_DIR}/macos-build.log" 2>&1
762799
# shellcheck disable=SC2181
763800
if [ $? != 0 ]; then echo "Error staging macOS. Check log."; exit 1; fi
764801

765-
./b2 "$THREADS" --build-dir=macos-build --stagedir=macos-build/stage --prefix="$MACOS_OUTPUT_DIR/prefix" \
766-
toolset="darwin-$MACOS_SDK_VERSION" architecture=x86 \
767-
cxxflags="${CXX_FLAGS} ${MACOS_ARCH_FLAGS[*]} ${EXTRA_MACOS_SDK_FLAGS}" \
768-
linkflags="-stdlib=libc++ ${EXTRA_MACOS_SDK_FLAGS}" link=static variant=${BUILD_VARIANT} threading=multi \
769-
macosx-version="$MACOS_SDK_VERSION" install >> "${MACOS_OUTPUT_DIR}/macos-build.log" 2>&1
802+
./b2 "$THREADS" \
803+
--build-dir=macos-build \
804+
--stagedir=macos-build/stage \
805+
--prefix="$MACOS_OUTPUT_DIR/prefix" \
806+
toolset="darwin-$COMPILER_VERSION~macos" \
807+
link=static \
808+
variant=${BUILD_VARIANT} \
809+
install >> "${MACOS_OUTPUT_DIR}/macos-build.log" 2>&1
770810
# shellcheck disable=SC2181
771811
if [ $? != 0 ]; then echo "Error installing macOS. Check log."; exit 1; fi
772812

@@ -844,7 +884,7 @@ scrunchAllLibsTogetherInOneLibPerPlatform()
844884
if [[ -n $BUILD_IOS ]]; then
845885
if [[ "${#IOS_ARCHS[@]}" -gt 1 ]]; then
846886
for ARCH in "${IOS_ARCHS[@]}"; do
847-
$IOS_ARM_DEV_CMD lipo "iphone-build/stage/lib/libboost_$NAME.a" \
887+
$IOS_DEV_CMD lipo "iphone-build/stage/lib/libboost_$NAME.a" \
848888
-thin "$ARCH" -o "$IOS_BUILD_DIR/$ARCH/libboost_$NAME.a"
849889
done
850890
else
@@ -941,7 +981,7 @@ scrunchAllLibsTogetherInOneLibPerPlatform()
941981
if [[ -n $BUILD_IOS ]]; then
942982
for ARCH in "${IOS_ARCHS[@]}"; do
943983
echo "...ios-$ARCH"
944-
(cd_or_abort "$IOS_BUILD_DIR/$ARCH"; $IOS_ARM_DEV_CMD ar crus libboost.a "obj/$NAME/"*.o; )
984+
(cd_or_abort "$IOS_BUILD_DIR/$ARCH"; $IOS_DEV_CMD ar crus libboost.a "obj/$NAME/"*.o; )
945985
done
946986

947987
for ARCH in "${IOS_SIM_ARCHS[@]}"; do
@@ -952,7 +992,7 @@ scrunchAllLibsTogetherInOneLibPerPlatform()
952992

953993
if [[ -n $BUILD_TVOS ]]; then
954994
echo "...tvOS-arm64"
955-
(cd_or_abort "$TVOS_BUILD_DIR/arm64"; $TVOS_ARM_DEV_CMD ar crus libboost.a "obj/$NAME/"*.o; )
995+
(cd_or_abort "$TVOS_BUILD_DIR/arm64"; $TVOS_DEV_CMD ar crus libboost.a "obj/$NAME/"*.o; )
956996
echo "...tvOS-x86_64"
957997
(cd_or_abort "$TVOS_BUILD_DIR/x86_64"; $TVOS_SIM_DEV_CMD ar crus libboost.a "obj/$NAME/"*.o; )
958998
fi
@@ -987,7 +1027,7 @@ buildUniversal()
9871027
done
9881028
if [[ "${#ARCH_FILES[@]}" -gt 0 ]]; then
9891029
echo "... $NAME"
990-
$IOS_ARM_DEV_CMD lipo -create "${ARCH_FILES[@]}" -o "universal/libboost_$NAME.a" || abort "Lipo $NAME failed"
1030+
$IOS_DEV_CMD lipo -create "${ARCH_FILES[@]}" -o "universal/libboost_$NAME.a" || abort "Lipo $NAME failed"
9911031
fi
9921032
done
9931033
fi
@@ -1009,7 +1049,7 @@ buildUniversal()
10091049
fi
10101050
if [[ "${#ARCH_FILES[@]}" -gt 0 ]]; then
10111051
echo "... $NAME"
1012-
$TVOS_ARM_DEV_CMD lipo -create "${ARCH_FILES[@]}" -o "universal/libboost_$NAME.a" || abort "Lipo $NAME failed"
1052+
$TVOS_DEV_CMD lipo -create "${ARCH_FILES[@]}" -o "universal/libboost_$NAME.a" || abort "Lipo $NAME failed"
10131053
fi
10141054
done
10151055
fi
@@ -1028,7 +1068,7 @@ buildUniversal()
10281068
done
10291069
if [[ "${#ARCH_FILES[@]}" -gt 0 ]]; then
10301070
echo "... $NAME"
1031-
$TVOS_ARM_DEV_CMD lipo -create "${ARCH_FILES[@]}" -o "universal/libboost_$NAME.a" || abort "Lipo $NAME failed"
1071+
$TVOS_DEV_CMD lipo -create "${ARCH_FILES[@]}" -o "universal/libboost_$NAME.a" || abort "Lipo $NAME failed"
10321072
fi
10331073
done
10341074
fi
@@ -1075,10 +1115,10 @@ buildFramework()
10751115
echo "Lipoing library into $FRAMEWORK_INSTALL_NAME..."
10761116
cd_or_abort "$BUILDDIR"
10771117
if [[ -n $BUILD_IOS ]]; then
1078-
$IOS_ARM_DEV_CMD lipo -create ./*/libboost.a -o "$FRAMEWORK_INSTALL_NAME" || abort "Lipo $1 failed"
1118+
$IOS_DEV_CMD lipo -create ./*/libboost.a -o "$FRAMEWORK_INSTALL_NAME" || abort "Lipo $1 failed"
10791119
fi
10801120
if [[ -n $BUILD_TVOS ]]; then
1081-
$TVOS_ARM_DEV_CMD lipo -create ./*/libboost.a -o "$FRAMEWORK_INSTALL_NAME" || abort "Lipo $1 failed"
1121+
$TVOS_DEV_CMD lipo -create ./*/libboost.a -o "$FRAMEWORK_INSTALL_NAME" || abort "Lipo $1 failed"
10821122
fi
10831123
if [[ -n $BUILD_MACOS ]]; then
10841124
$MACOS_DEV_CMD lipo -create ./*/libboost.a -o "$FRAMEWORK_INSTALL_NAME" || abort "Lipo $1 failed"
@@ -1144,7 +1184,6 @@ EXTRA_IOS_SIM_FLAGS="$EXTRA_FLAGS $EXTRA_ARM_FLAGS -mios-simulator-version-min=$
11441184
EXTRA_TVOS_FLAGS="$EXTRA_FLAGS $EXTRA_ARM_FLAGS -mtvos-version-min=$MIN_TVOS_VERSION"
11451185
EXTRA_TVOS_SIM_FLAGS="$EXTRA_FLAGS $EXTRA_ARM_FLAGS -mtvos-simulator-version-min=$MIN_TVOS_VERSION"
11461186
EXTRA_MACOS_FLAGS="$EXTRA_FLAGS -mmacosx-version-min=$MIN_MACOS_VERSION"
1147-
EXTRA_MACOS_SDK_FLAGS="-isysroot ${MACOS_SDK_PATH} -mmacosx-version-min=${MIN_MACOS_VERSION}"
11481187

11491188
BOOST_VERSION2="${BOOST_VERSION//./_}"
11501189
BOOST_TARBALL="$CURRENT_DIR/boost_$BOOST_VERSION2.tar.bz2"
@@ -1183,29 +1222,36 @@ printVar()
11831222
}
11841223
asBool() { test -n "$1" && echo "YES" || echo "NO"; }
11851224

1186-
printVar "BUILD_IOS" "$(asBool "$BUILD_IOS")"
1187-
printVar "BUILD_TVOS" "$(asBool "$BUILD_TVOS")"
1188-
printVar "BUILD_MACOS" "$(asBool "$BUILD_MACOS")"
11891225
printVar "BOOST_VERSION"
1226+
echo
1227+
printVar "BUILD_IOS" "$(asBool "$BUILD_IOS")"
1228+
printVar "IOS_ARCHS"
11901229
printVar "IOS_SDK_VERSION"
1230+
printVar "IOS_SDK_PATH"
1231+
printVar "IOSSIM_SDK_PATH"
11911232
printVar "MIN_IOS_VERSION"
1233+
echo
1234+
printVar "BUILD_TVOS" "$(asBool "$BUILD_TVOS")"
11921235
printVar "TVOS_SDK_VERSION"
11931236
printVar "TVOS_SDK_PATH"
11941237
printVar "TVOSSIM_SDK_PATH"
11951238
printVar "MIN_TVOS_VERSION"
1239+
echo
1240+
printVar "BUILD_MACOS" "$(asBool "$BUILD_MACOS")"
1241+
printVar "MACOS_ARCHS"
11961242
printVar "MACOS_SDK_VERSION"
11971243
printVar "MACOS_SDK_PATH"
11981244
printVar "MIN_MACOS_VERSION"
1199-
printVar "MACOS_ARCHS"
1200-
printVar "IOS_ARCHS"
1201-
printVar "IOS_SIM_ARCHS"
1245+
echo
12021246
printVar "BOOST_LIBS"
12031247
printVar "BOOST_SRC"
1248+
printVar "XCODE_ROOT"
12041249
printVar "IOS_BUILD_DIR"
1250+
printVar "TVOS_BUILD_DIR"
12051251
printVar "MACOS_BUILD_DIR"
1252+
printVar "TVOS_FRAMEWORK_DIR"
12061253
printVar "IOS_FRAMEWORK_DIR"
12071254
printVar "MACOS_FRAMEWORK_DIR"
1208-
printVar "XCODE_ROOT"
12091255
printVar "THREADS"
12101256
printVar "BUILD_VARIANT"
12111257
echo

‎changelog‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
-- 2020-05-31 --
2+
* Cleanup build commands and patch of Boost's user-config.jam
3+
14
-- 2020-04-18 --
25
* Updated default boost version to 1.72.0
36
* Fixed error "unknown argument: '-fcoalesce-templates'" when building with Xcode 11.4 (#45)

0 commit comments

Comments
 (0)