From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17A15158095 for ; Thu, 6 Oct 2022 20:11:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6799FE0A03; Thu, 6 Oct 2022 20:11:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4C7ACE0A03 for ; Thu, 6 Oct 2022 20:11:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9149340FE6 for ; Thu, 6 Oct 2022 20:11:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3AC6627 for ; Thu, 6 Oct 2022 20:11:24 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1665087079.502e5f649c1f68a28cb9aa26b3ad5b7f6ab4cd99.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang-common/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang-common/clang-common-15.0.2.9999.ebuild sys-devel/clang-common/clang-common-16.0.0.9999.ebuild sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild X-VCS-Directories: sys-devel/clang-common/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 502e5f649c1f68a28cb9aa26b3ad5b7f6ab4cd99 X-VCS-Branch: master Date: Thu, 6 Oct 2022 20:11:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4f52858e-20bd-4540-ba39-70ab8df9724d X-Archives-Hash: 28dd1c4d5252f0b6783118f633f73e1d commit: 502e5f649c1f68a28cb9aa26b3ad5b7f6ab4cd99 Author: Michał Górny gentoo org> AuthorDate: Thu Oct 6 19:53:46 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Oct 6 20:11:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502e5f64 sys-devel/clang-common: Multiple config improvements - explicitly use binutils/GCC runtime defaults when default-* flags are disabled instead of relying on implicit platform defaults - add explicit dependencies on binutils/GCC when the respective runtimes or tools are used - use long option forms - explicitly use ld.bfd instead of ld, when lld is not used Notably, this resolves a problem of clang implicitly choosing ld.lld when sys-devel/lld-toolchain-symlinks[native-symlinks] is installed. Signed-off-by: Michał Górny gentoo.org> sys-devel/clang-common/clang-common-15.0.2.9999.ebuild | 15 +++++++-------- sys-devel/clang-common/clang-common-16.0.0.9999.ebuild | 15 +++++++-------- .../clang-common/clang-common-16.0.0_pre20221006.ebuild | 15 +++++++-------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild b/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild index db83638be497..7fc966f60858 100644 --- a/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild +++ b/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild @@ -20,8 +20,11 @@ PDEPEND=" llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) + !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-${PV} ) + !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) + !default-lld? ( sys-devel/binutils ) " LLVM_COMPONENTS=( clang/utils ) @@ -53,10 +56,6 @@ pkg_pretend() { fi } -usec() { - usex "default-${1}" "" "# " -} - src_install() { newbashcomp bash-autocomplete.sh clang @@ -65,10 +64,10 @@ src_install() { # This file is initially generated by sys-devel/clang-runtime. # It is used to control the default runtimes using by clang. - $(usec compiler-rt)-rtlib=compiler-rt - $(usec compiler-rt)-unwindlib=libunwind - $(usec libcxx)-stdlib=libc++ - $(usec lld)-fuse-ld=lld + --rtlib=$(usex default-compiler-rt compiler-rt libgcc) + --unwindlib=$(usex default-compiler-rt libunwind libgcc) + --stdlib=$(usex default-libcxx libc++ libstdc++) + -fuse-ld=$(usex default-lld lld bfd) EOF newins - gentoo-gcc-install.cfg <<-EOF diff --git a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild index db83638be497..7fc966f60858 100644 --- a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild +++ b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild @@ -20,8 +20,11 @@ PDEPEND=" llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) + !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-${PV} ) + !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) + !default-lld? ( sys-devel/binutils ) " LLVM_COMPONENTS=( clang/utils ) @@ -53,10 +56,6 @@ pkg_pretend() { fi } -usec() { - usex "default-${1}" "" "# " -} - src_install() { newbashcomp bash-autocomplete.sh clang @@ -65,10 +64,10 @@ src_install() { # This file is initially generated by sys-devel/clang-runtime. # It is used to control the default runtimes using by clang. - $(usec compiler-rt)-rtlib=compiler-rt - $(usec compiler-rt)-unwindlib=libunwind - $(usec libcxx)-stdlib=libc++ - $(usec lld)-fuse-ld=lld + --rtlib=$(usex default-compiler-rt compiler-rt libgcc) + --unwindlib=$(usex default-compiler-rt libunwind libgcc) + --stdlib=$(usex default-libcxx libc++ libstdc++) + -fuse-ld=$(usex default-lld lld bfd) EOF newins - gentoo-gcc-install.cfg <<-EOF diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild index db83638be497..7fc966f60858 100644 --- a/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild +++ b/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild @@ -20,8 +20,11 @@ PDEPEND=" llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) + !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-${PV} ) + !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) + !default-lld? ( sys-devel/binutils ) " LLVM_COMPONENTS=( clang/utils ) @@ -53,10 +56,6 @@ pkg_pretend() { fi } -usec() { - usex "default-${1}" "" "# " -} - src_install() { newbashcomp bash-autocomplete.sh clang @@ -65,10 +64,10 @@ src_install() { # This file is initially generated by sys-devel/clang-runtime. # It is used to control the default runtimes using by clang. - $(usec compiler-rt)-rtlib=compiler-rt - $(usec compiler-rt)-unwindlib=libunwind - $(usec libcxx)-stdlib=libc++ - $(usec lld)-fuse-ld=lld + --rtlib=$(usex default-compiler-rt compiler-rt libgcc) + --unwindlib=$(usex default-compiler-rt libunwind libgcc) + --stdlib=$(usex default-libcxx libc++ libstdc++) + -fuse-ld=$(usex default-lld lld bfd) EOF newins - gentoo-gcc-install.cfg <<-EOF