Skip to content

Commit b226a1c

Browse files
committed
Merge pull request #2919 from dgovil/boost_python_clang15_fixes
Disable BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT for MacOS builds (Internal change: 2317210)
2 parents 3bcae24 + 1f77f0d commit b226a1c

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

build_scripts/build_usd.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,14 @@ def InstallBoost_Helper(context, force, buildArgs):
895895
# Must specify toolset=clang to ensure install_name for boost
896896
# libraries includes @rpath
897897
b2_settings.append("toolset=clang")
898-
898+
#
899+
# Xcode 15.3 (and hence Apple Clang 15) removed the global
900+
# declaration of std::piecewise_construct which causes boost build
901+
# to fail.
902+
# https://developer.apple.com/documentation/xcode-release-notes/xcode-15_3-release-notes.
903+
# A fix for the same is also available in boost 1.84:
904+
# https://github.com/boostorg/container/commit/79a75f470e75f35f5f2a91e10fcc67d03b0a2160
905+
b2_settings.append(f"define=BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT=0")
899906
if macOSArch:
900907
b2_settings.append("cxxflags=\"{0}\"".format(macOSArch))
901908
b2_settings.append("cflags=\"{0}\"".format(macOSArch))

0 commit comments

Comments
 (0)