gentoo resync : 15.12.2019

6 files changed, 184 insertions, 31 deletions

diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 0fa2d43fe006..85479daecaa5 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,15 +1,16 @@
-DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
 DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B eca192e03f839f4323e3c37beba2e6daaf935d4e784e0bc835a4d2c3ce0790f5539bdca0466feafd668d7c6675b11b7fe14d9adb680c46fd7b28b42a3b423219 SHA512 925ce5093445f84dc17d5b1610e4297ef3606b254b7350c50f88ba042fcca62125ffd97d21cb612707d5e9511267634ca1779619199f95ce819e5f5c0c2b55d5
 DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
 DIST libcxx-9.0.0.src.tar.xz 1814388 BLAKE2B 59b8967706d1f85b1c0d2b9932bd637aae7118ae461e2b31e1d17c9a2ee2e02ea0ea8b344074a9fc4b430b5c742b8ad30c10a0c44e5290528fdecd7571352879 SHA512 cbaca724c4f3e3a270dfd53aac50cbb920190fe55486b164d52e73845819dd22afb10c23f5875da59d433fd5b96a0f153208746117309ac1267a38fa56f4818e
-DIST libcxxabi-6.0.1.src.tar.xz 528356 BLAKE2B b301b750b2928864d3fc51e66cf91aab6837636ec2bce706b9a97296ec96af4bd2e80b1bf80c9b4afe449335ee12bbdd1905433c27e1770e16bc306baf206927 SHA512 bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2
 DIST libcxxabi-7.1.0.src.tar.xz 535180 BLAKE2B aa5952e3ca80f7ce2a0a79f3eaf3852234e23a8445a2539374bedb188aba7d973763a6c0d7cc7700070d942555250f87c3c9efb504bb731985be033d47b79b44 SHA512 629ef641ab5aba28ea7171efbad806f1f0464eee2d04f8903014a4f82c03f2c6513defbbe5489b2c6fd624270fe8efbad97a40e56958f8f38a4f5516a16dd102
 DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
 DIST libcxxabi-9.0.0.src.tar.xz 552088 BLAKE2B 1b8f2bab00437a223f613cbecd9171f1bc88d0ec2d6096776d0295333c0176ddbe13178d433bed2dc70821b905152fcd30b228ae1dbd3e8846f3b92e7630db7e SHA512 261f32f61814728ce61c830c80192a55e1ba03c50f49712e208052444ac3acc6d7efcbd7b76a505292f9233aad23b00180aca4e72326ae1244385b39f226e625
-EBUILD libcxxabi-10.0.0.9999.ebuild 2984 BLAKE2B 2d5e19d65c798004a761167c15008399bc02641abe5899178ae430a7c141867586ced56044873744ef681b259ecb4f220195b56335992b34ce3be21d62d5ebd8 SHA512 b647d0ff00030c45fc01f8194d6a01a8800b1f165deb9e336d541060b7fabc6ae2962aa923d1f79db886c6c2bb8e82a30113a3c5da550028aefe793da3a17b5e
-EBUILD libcxxabi-6.0.1.ebuild 3160 BLAKE2B f71f407049fde2c3310ffd6626e19398abef0d5d521b1e88ac7139dc45a44e8a8ef67bceddbbbc3e653bf8dd824cd1e429be4e4de4805384b27207b26a3d6299 SHA512 4ff855c703b50eb2165cc9b0942a5de556ea3fd07a9a56b468d72df113473d3ec249ed4887e7b353138dc218a767e299fec9dd43650e1794e39a4455c8f0f68d
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
+EBUILD libcxxabi-10.0.0.9999.ebuild 3363 BLAKE2B ef84e208dd036347eace8b38f0378e34aa010265be6e04a502efd835cc357492371fcccbeb285c4a9217c33434f9069e3979a9b967c2049d3b3ff4b9d7d25c5b SHA512 a5f46f878db09827bb1867c7ddf00f57760fa464c6812275d88c086f5432877de8b62b72b828f2e162fa00697901bb02d62a691f3d040ba53cecb658daac842c
 EBUILD libcxxabi-7.1.0.ebuild 3160 BLAKE2B 5b90f5ce5637b75316cc992dd50105c87e7e55c8bd608a5d0280556ca14e57b2be47d5a81bbef0be37c8ace675887bdd4e44029e8efb8cd4f7a69b7eb6eef488 SHA512 8a03888a55c60959802824e54c78bdc9b8e74501bdd8b5a47bbc619290e03e8815658e5f33f9fdc9befc66f9fc36ff5ac2d36008824e3800f76b299508e706e0
 EBUILD libcxxabi-8.0.1.ebuild 3226 BLAKE2B 9804f1976cd7e605cf60a07e69c66f97795bebf66779fb69fe500cb6f4693e63d799fdb57991b2b65bde309e72e2e6055c3e88fd1ebf0be725982a253faf10b7 SHA512 42ccc6ccfc69c95dd465542d90a6a6bc0558703fcf2b5b1acb5c828728416cddbd5af925552b231c890af8c89533073a3f13d87da9c1401cf8904bb4dc5e72de
-EBUILD libcxxabi-9.0.0.ebuild 3007 BLAKE2B 7aa0ad17a02b26f548f6a4cd6e39b2dbfa3c298f76b5ba0a708de4b130e265a25e2476c21fb30c9f427065fb259029dc53e4bf8d22a730a61f793870cc5d1038 SHA512 32411ec0cb1722f4e09787e22b08b40334fdad52f5da7ec6c918934269c211b76936fa7d5c664f572f874fe022c907e51dcbb9edf9a62f65e773e2828c2bc578
-EBUILD libcxxabi-9.0.1.9999.ebuild 2984 BLAKE2B 2d5e19d65c798004a761167c15008399bc02641abe5899178ae430a7c141867586ced56044873744ef681b259ecb4f220195b56335992b34ce3be21d62d5ebd8 SHA512 b647d0ff00030c45fc01f8194d6a01a8800b1f165deb9e336d541060b7fabc6ae2962aa923d1f79db886c6c2bb8e82a30113a3c5da550028aefe793da3a17b5e
+EBUILD libcxxabi-9.0.0.ebuild 3386 BLAKE2B bf9e7b54ba2a8f17238563fe40c7804b54510539a4df10df9d0b8da008551788dc4e1be982c6d8ab23652c54290ca584a139b36fc6140d750e659d040fcd6b89 SHA512 e47d9855c0d51c654c962bd5a4ed94abf3c185fe03f87396781e35ba23ce6c4d7d15d0bab2b4a78cf16084fed44e3cc63bb2782baf14e409bdf90ee2009bb643
+EBUILD libcxxabi-9.0.1.9999.ebuild 3363 BLAKE2B ef84e208dd036347eace8b38f0378e34aa010265be6e04a502efd835cc357492371fcccbeb285c4a9217c33434f9069e3979a9b967c2049d3b3ff4b9d7d25c5b SHA512 a5f46f878db09827bb1867c7ddf00f57760fa464c6812275d88c086f5432877de8b62b72b828f2e162fa00697901bb02d62a691f3d040ba53cecb658daac842c
+EBUILD libcxxabi-9.0.1_rc2.ebuild 3386 BLAKE2B bf9e7b54ba2a8f17238563fe40c7804b54510539a4df10df9d0b8da008551788dc4e1be982c6d8ab23652c54290ca584a139b36fc6140d750e659d040fcd6b89 SHA512 e47d9855c0d51c654c962bd5a4ed94abf3c185fe03f87396781e35ba23ce6c4d7d15d0bab2b4a78cf16084fed44e3cc63bb2782baf14e409bdf90ee2009bb643
+EBUILD libcxxabi-9.0.1_rc3.ebuild 3386 BLAKE2B bf9e7b54ba2a8f17238563fe40c7804b54510539a4df10df9d0b8da008551788dc4e1be982c6d8ab23652c54290ca584a139b36fc6140d750e659d040fcd6b89 SHA512 e47d9855c0d51c654c962bd5a4ed94abf3c185fe03f87396781e35ba23ce6c4d7d15d0bab2b4a78cf16084fed44e3cc63bb2782baf14e409bdf90ee2009bb643
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild
index df108a4e0237..4bdd0295a168 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild
@@ -45,6 +45,16 @@ pkg_setup() {
 }
 
 multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
@@ -52,6 +62,7 @@ multilib_src_configure() {
 		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
 		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
 		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
 
 		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
 		# upstream is omitting standard search path for this
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild
index eb2960357792..3d656a49cf7d 100644
--- a/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.0.ebuild
@@ -45,6 +45,16 @@ pkg_setup() {
 }
 
 multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
@@ -52,6 +62,7 @@ multilib_src_configure() {
 		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
 		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
 		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
 
 		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
 		# upstream is omitting standard search path for this
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild
index df108a4e0237..4bdd0295a168 100644
--- a/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild
@@ -45,6 +45,16 @@ pkg_setup() {
 }
 
 multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
@@ -52,6 +62,7 @@ multilib_src_configure() {
 		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
 		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
 		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
 
 		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
 		# upstream is omitting standard search path for this
diff --git a/sys-libs/libcxxabi/libcxxabi-6.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1_rc2.ebuild
index 1d40c35736c8..3d656a49cf7d 100644
--- a/sys-libs/libcxxabi/libcxxabi-6.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1_rc2.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib llvm multiprocessing python-any-r1
-
-MY_P=${P/_/}.src
-LIBCXX_P=libcxx-${PV/_/}.src
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="Low level support for a standard C++ library"
 HOMEPAGE="https://libcxxabi.llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz"
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} )
+llvm.org_set_globals
 
-LICENSE="|| ( UoI-NCSA MIT )"
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
@@ -33,12 +27,11 @@ RDEPEND="
 	)"
 # llvm-6 for new lit options
 DEPEND="${RDEPEND}
-	>=sys-devel/llvm-6
+	>=sys-devel/llvm-6"
+BDEPEND="
 	test? ( >=sys-devel/clang-3.9.0
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
-S=${WORKDIR}/${MY_P}
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
@@ -51,12 +44,17 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	default
-	mv "${LIBCXX_P}" libcxx || die
-}
-
 multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
@@ -64,6 +62,7 @@ multilib_src_configure() {
 		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
 		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
 		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
 
 		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
 		# upstream is omitting standard search path for this
@@ -90,8 +89,8 @@ build_libcxx() {
 	local BUILD_DIR=${BUILD_DIR}/libcxx
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
 		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
 		-DLIBCXX_CXX_ABI=libcxxabi
 		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
@@ -110,6 +109,7 @@ multilib_src_test() {
 	build_libcxx
 	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
+	local -x LIT_PRESERVES_TMP=1
 	cmake-utils_src_make check-libcxxabi
 }
 
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.1_rc3.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..3d656a49cf7d
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1_rc3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+libunwind +static-libs test elibc_musl"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)"
+# llvm-6 for new lit options
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
+
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+}
+
+multilib_src_test() {
+	# build a local copy of libc++ for testing to avoid circular dep
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-libcxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}