summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex R <lyssdod@gmail.com>2021-07-05 00:58:46 +0200
committerMichał Górny <mgorny@gentoo.org>2021-07-05 07:40:26 +0200
commit46a2a8d90efe4cf8f29649263ecc4a13d542fe5d (patch)
treec2269b0613971e3f3de4305fb1837d3bf319b033
parentsys-libs/llvm-libunwind: use compiler-rt if possible (diff)
downloadgentoo-46a2a8d90efe4cf8f29649263ecc4a13d542fe5d.tar.gz
gentoo-46a2a8d90efe4cf8f29649263ecc4a13d542fe5d.tar.bz2
gentoo-46a2a8d90efe4cf8f29649263ecc4a13d542fe5d.zip
sys-libs/libcxx: use gcc libatomic only with libgcc_s
Signed-off-by: Alex Revin <lyssdod@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21516 Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--sys-libs/libcxx/libcxx-12.0.0.ebuild1
-rw-r--r--sys-libs/libcxx/libcxx-12.0.1.9999.ebuild1
-rw-r--r--sys-libs/libcxx/libcxx-12.0.1_rc2.ebuild1
-rw-r--r--sys-libs/libcxx/libcxx-13.0.0.9999.ebuild1
4 files changed, 4 insertions, 0 deletions
diff --git a/sys-libs/libcxx/libcxx-12.0.0.ebuild b/sys-libs/libcxx/libcxx-12.0.0.ebuild
index c5ca6ee892f9..3463d022a19e 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 1f529867fb7b..861d92b62c20 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 1f529867fb7b..861d92b62c20 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 1f529867fb7b..861d92b62c20 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}"
)