[gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxxabi/

[Michał Górny]

commit:     8f406be79341f21fa8cbc161181509676aa0c83b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  3 18:02:12 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug  3 18:03:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f406be7

sys-libs/libcxxabi: Use ninja target for headers in 13+

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild | 3 +--
 sys-libs/libcxxabi/libcxxabi-13.0.0_rc1.ebuild  | 3 +--
 sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild 
b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
index 88b0bb90ab5..d11be625eea 100644
--- a/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
@@ -50,8 +50,7 @@ pkg_setup() {
 multilib_src_configure() {
        # we need a configured libc++ for __config_site
        wrap_libcxx cmake_src_configure
-       cp -R "${WORKDIR}"/libcxx/include/. \
-               "${BUILD_DIR}"/libcxx/include/c++/v1 || die
+       wrap_libcxx cmake_build generate-cxx-headers
 
        # link against compiler-rt instead of libgcc if we are using clang with 
libunwind
        local want_compiler_rt=OFF

diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0_rc1.ebuild 
b/sys-libs/libcxxabi/libcxxabi-13.0.0_rc1.ebuild
index 88b0bb90ab5..d11be625eea 100644
--- a/sys-libs/libcxxabi/libcxxabi-13.0.0_rc1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.0_rc1.ebuild
@@ -50,8 +50,7 @@ pkg_setup() {
 multilib_src_configure() {
        # we need a configured libc++ for __config_site
        wrap_libcxx cmake_src_configure
-       cp -R "${WORKDIR}"/libcxx/include/. \
-               "${BUILD_DIR}"/libcxx/include/c++/v1 || die
+       wrap_libcxx cmake_build generate-cxx-headers
 
        # link against compiler-rt instead of libgcc if we are using clang with 
libunwind
        local want_compiler_rt=OFF

diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild 
b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
index 88b0bb90ab5..d11be625eea 100644
--- a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
@@ -50,8 +50,7 @@ pkg_setup() {
 multilib_src_configure() {
        # we need a configured libc++ for __config_site
        wrap_libcxx cmake_src_configure
-       cp -R "${WORKDIR}"/libcxx/include/. \
-               "${BUILD_DIR}"/libcxx/include/c++/v1 || die
+       wrap_libcxx cmake_build generate-cxx-headers
 
        # link against compiler-rt instead of libgcc if we are using clang with 
libunwind
        local want_compiler_rt=OFF