Skip to content

Commit 666e134

Browse files
committed
force 32+64-bit archs when building macOS universal.
1 parent 93450eb commit 666e134

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

boost.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,11 @@ parseArgs()
414414
BOOST_LIBS=$CUSTOM_LIBS
415415
fi
416416

417+
# Force 32/64-bit architecture when building universal macOS.
418+
if [[ -n $BUILD_MACOS && -n $UNIVERSAL ]]; then
419+
CUSTOM_MACOS_ARCHS=("i386 x86_64")
420+
fi
421+
417422
if [[ -n $CUSTOM_MACOS_ARCHS ]]; then
418423
MACOS_ARCHS=($CUSTOM_MACOS_ARCHS)
419424
fi
@@ -905,8 +910,6 @@ buildUniversal()
905910
fi
906911
done
907912
fi
908-
# Note caller needs to manually pass in --macos-archs "i386 x86_64" (in addition to --universal)
909-
# to build 32 bit and 64 bit fat.
910913
if [[ -n $BUILD_MACOS ]]; then
911914
mkdir -p "$MACOS_BUILD_DIR/universal"
912915

changelog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
-- 2018-09-20 --
2+
* Added support for building 32/64-bit macOS universal.
3+
14
-- 2018-06-07 --
25
* Added a CLI flag to create universal FAT binaries for iOS and tvOS.
36

0 commit comments

Comments
 (0)