commit:     28907fb65bfbb1e76da28a18339abdd07e4b53a6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 13:14:39 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 14:52:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28907fb6

sys-devel/clang: Remove obsolete default-* flags in 16.x

Now that the defaults are controlled via the configuration file,
remove the relevant flags from the sys-devel/clang ebuilds.

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

 sys-devel/clang/clang-16.0.0.9999.ebuild        | 17 +----------------
 sys-devel/clang/clang-16.0.0_pre20220930.ebuild | 17 +----------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/sys-devel/clang/clang-16.0.0.9999.ebuild 
b/sys-devel/clang/clang-16.0.0.9999.ebuild
index 1bf259b60f4b..d8c93d2e1d27 100644
--- a/sys-devel/clang/clang-16.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-16.0.0.9999.ebuild
@@ -16,10 +16,7 @@ HOMEPAGE="https://llvm.org/";
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
-IUSE="
-       debug default-compiler-rt default-libcxx default-lld doc
-       llvm-libunwind +pie +static-analyzer test xml
-"
+IUSE="debug doc +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -47,13 +44,6 @@ PDEPEND="
        sys-devel/clang-common
        sys-devel/clang-toolchain-symlinks:${SLOT}
        ~sys-devel/clang-runtime-${PV}
-       default-compiler-rt? (
-               =sys-libs/compiler-rt-${PV%_*}*
-               llvm-libunwind? ( sys-libs/llvm-libunwind )
-               !llvm-libunwind? ( sys-libs/libunwind )
-       )
-       default-libcxx? ( >=sys-libs/libcxx-${PV} )
-       default-lld? ( sys-devel/lld )
 "
 
 LLVM_COMPONENTS=(
@@ -284,12 +274,7 @@ multilib_src_configure() {
                # disable using CUDA to autodetect GPU, just build for all
                -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
 
-               # override default stdlib and rtlib
-               -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-               -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-               -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
                -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-               -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind 
"")
 
                -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
                -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)

diff --git a/sys-devel/clang/clang-16.0.0_pre20220930.ebuild 
b/sys-devel/clang/clang-16.0.0_pre20220930.ebuild
index 1bf259b60f4b..d8c93d2e1d27 100644
--- a/sys-devel/clang/clang-16.0.0_pre20220930.ebuild
+++ b/sys-devel/clang/clang-16.0.0_pre20220930.ebuild
@@ -16,10 +16,7 @@ HOMEPAGE="https://llvm.org/";
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS=""
-IUSE="
-       debug default-compiler-rt default-libcxx default-lld doc
-       llvm-libunwind +pie +static-analyzer test xml
-"
+IUSE="debug doc +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -47,13 +44,6 @@ PDEPEND="
        sys-devel/clang-common
        sys-devel/clang-toolchain-symlinks:${SLOT}
        ~sys-devel/clang-runtime-${PV}
-       default-compiler-rt? (
-               =sys-libs/compiler-rt-${PV%_*}*
-               llvm-libunwind? ( sys-libs/llvm-libunwind )
-               !llvm-libunwind? ( sys-libs/libunwind )
-       )
-       default-libcxx? ( >=sys-libs/libcxx-${PV} )
-       default-lld? ( sys-devel/lld )
 "
 
 LLVM_COMPONENTS=(
@@ -284,12 +274,7 @@ multilib_src_configure() {
                # disable using CUDA to autodetect GPU, just build for all
                -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
 
-               # override default stdlib and rtlib
-               -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-               -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-               -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
                -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-               -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind 
"")
 
                -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
                -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)

Reply via email to