commit: 625c72824647153264673e16d56a4f1729417506
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 3 18:08:15 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 3 18:09:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625c7282
sys-libs/compiler-rt: Add ABI_X86 flags
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild | 11 ++++++++++-
sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild | 11 ++++++++++-
sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild | 11 ++++++++++-
3 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild
b/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild
index d6a1a16eb346..ef78484f7721 100644
--- a/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild
@@ -3,8 +3,10 @@
EAPI=7
+MULTILIB_COMPAT=( abi_x86_{32,64} )
PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \
+ toolchain-funcs
DESCRIPTION="Compiler runtime library for clang (built-in part)"
HOMEPAGE="https://llvm.org/";
@@ -94,6 +96,13 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
)
+ if use amd64; then
+ mycmakeargs+=(
+ -DCAN_TARGET_i386=$(usex abi_x86_32)
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64)
+ )
+ fi
+
if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
mycmakeargs+=(
# setting -isysroot is disabled with
compiler-rt-prefix-paths.patch
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild
b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild
index 23214f0469bf..59324e768209 100644
--- a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild
@@ -3,8 +3,10 @@
EAPI=7
+MULTILIB_COMPAT=( abi_x86_{32,64} )
PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \
+ toolchain-funcs
DESCRIPTION="Compiler runtime library for clang (built-in part)"
HOMEPAGE="https://llvm.org/";
@@ -94,6 +96,13 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
)
+ if use amd64; then
+ mycmakeargs+=(
+ -DCAN_TARGET_i386=$(usex abi_x86_32)
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64)
+ )
+ fi
+
if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
mycmakeargs+=(
# setting -isysroot is disabled with
compiler-rt-prefix-paths.patch
diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild
b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild
index 0928ea166320..f8402de337a2 100644
--- a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild
@@ -3,8 +3,10 @@
EAPI=7
+MULTILIB_COMPAT=( abi_x86_{32,64} )
PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \
+ toolchain-funcs
DESCRIPTION="Compiler runtime library for clang (built-in part)"
HOMEPAGE="https://llvm.org/";
@@ -94,6 +96,13 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
)
+ if use amd64; then
+ mycmakeargs+=(
+ -DCAN_TARGET_i386=$(usex abi_x86_32)
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64)
+ )
+ fi
+
if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
mycmakeargs+=(
# setting -isysroot is disabled with
compiler-rt-prefix-paths.patch
