commit:     46a2a8d90efe4cf8f29649263ecc4a13d542fe5d
Author:     Alex R <lyssdod <AT> gmail <DOT> com>
AuthorDate: Sun Jul  4 22:58:46 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 05:40:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a2a8d9

sys-libs/libcxx: use gcc libatomic only with libgcc_s

Signed-off-by: Alex Revin <lyssdod <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21516
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-libs/libcxx/libcxx-12.0.0.ebuild      | 1 +
 sys-libs/libcxx/libcxx-12.0.1.9999.ebuild | 1 +
 sys-libs/libcxx/libcxx-12.0.1_rc2.ebuild  | 1 +
 sys-libs/libcxx/libcxx-13.0.0.9999.ebuild | 1 +
 4 files changed, 4 insertions(+)

diff --git a/sys-libs/libcxx/libcxx-12.0.0.ebuild 
b/sys-libs/libcxx/libcxx-12.0.0.ebuild
index c5ca6ee892f..3463d022a19 100644
--- a/sys-libs/libcxx/libcxx-12.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-12.0.0.ebuild
@@ -140,6 +140,7 @@ multilib_src_configure() {
                -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
                -DLIBCXX_INCLUDE_TESTS=$(usex test)
                -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+               -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
                -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
        )
 

diff --git a/sys-libs/libcxx/libcxx-12.0.1.9999.ebuild 
b/sys-libs/libcxx/libcxx-12.0.1.9999.ebuild
index 1f529867fb7..861d92b62c2 100644
--- a/sys-libs/libcxx/libcxx-12.0.1.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-12.0.1.9999.ebuild
@@ -131,6 +131,7 @@ multilib_src_configure() {
                -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
                -DLIBCXX_INCLUDE_TESTS=$(usex test)
                -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+               -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
                -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
        )
 

diff --git a/sys-libs/libcxx/libcxx-12.0.1_rc2.ebuild 
b/sys-libs/libcxx/libcxx-12.0.1_rc2.ebuild
index 1f529867fb7..861d92b62c2 100644
--- a/sys-libs/libcxx/libcxx-12.0.1_rc2.ebuild
+++ b/sys-libs/libcxx/libcxx-12.0.1_rc2.ebuild
@@ -131,6 +131,7 @@ multilib_src_configure() {
                -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
                -DLIBCXX_INCLUDE_TESTS=$(usex test)
                -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+               -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
                -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
        )
 

diff --git a/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild 
b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
index 1f529867fb7..861d92b62c2 100644
--- a/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
@@ -131,6 +131,7 @@ multilib_src_configure() {
                -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
                -DLIBCXX_INCLUDE_TESTS=$(usex test)
                -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+               -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
                -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
        )
 

Reply via email to