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 8B49D15838C for ; Sun, 28 Jan 2024 20:01:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D277B2BC013; Sun, 28 Jan 2024 20:01:06 +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 B5DBC2BC013 for ; Sun, 28 Jan 2024 20:01:06 +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 C748E335C4E for ; Sun, 28 Jan 2024 20:01:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 628B512C8 for ; Sun, 28 Jan 2024 20:01:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1706472033.388df0755c165a987ff032cd69f03803cc47815b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-120.0.6099.129.ebuild www-client/chromium/chromium-120.0.6099.224.ebuild www-client/chromium/chromium-121.0.6167.85.ebuild www-client/chromium/chromium-122.0.6261.6.ebuild X-VCS-Directories: www-client/chromium/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 388df0755c165a987ff032cd69f03803cc47815b X-VCS-Branch: master Date: Sun, 28 Jan 2024 20:01:04 +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: 67a229ef-3f74-4259-bf2b-142ca3d29be1 X-Archives-Hash: 4af014633bea8fbb77c08c57cc88575c commit: 388df0755c165a987ff032cd69f03803cc47815b Author: Sam James gentoo org> AuthorDate: Sun Jan 28 19:59:40 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 28 20:00:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=388df075 www-client/chromium: check tc-ld-is-lld for use_lld param Make sure we enable the LLD toggle if the user has enabled LLD themselves rather than the ebuild doing it. Signed-off-by: Sam James gentoo.org> www-client/chromium/chromium-120.0.6099.129.ebuild | 2 +- www-client/chromium/chromium-120.0.6099.224.ebuild | 2 +- www-client/chromium/chromium-121.0.6167.85.ebuild | 2 +- www-client/chromium/chromium-122.0.6261.6.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www-client/chromium/chromium-120.0.6099.129.ebuild b/www-client/chromium/chromium-120.0.6099.129.ebuild index 91a4aac3089a..e54129b80752 100644 --- a/www-client/chromium/chromium-120.0.6099.129.ebuild +++ b/www-client/chromium/chromium-120.0.6099.129.ebuild @@ -723,7 +723,7 @@ chromium_configure() { append-ldflags $(test-flags-CCLD -Wl,--undefined-version) # Force lld for lto and pgo builds, otherwise disable, bug 641556 - if needs_lld || use lto || use pgo; then + if needs_lld || tc-ld-is-lld || use lto || use pgo; then myconf_gn+=" use_lld=true" else myconf_gn+=" use_lld=false" diff --git a/www-client/chromium/chromium-120.0.6099.224.ebuild b/www-client/chromium/chromium-120.0.6099.224.ebuild index fc235299b7a4..befc4cb52737 100644 --- a/www-client/chromium/chromium-120.0.6099.224.ebuild +++ b/www-client/chromium/chromium-120.0.6099.224.ebuild @@ -723,7 +723,7 @@ chromium_configure() { append-ldflags $(test-flags-CCLD -Wl,--undefined-version) # Force lld for lto and pgo builds, otherwise disable, bug 641556 - if needs_lld || use lto || use pgo; then + if needs_lld || tc-ld-is-lld || use lto || use pgo; then myconf_gn+=" use_lld=true" else myconf_gn+=" use_lld=false" diff --git a/www-client/chromium/chromium-121.0.6167.85.ebuild b/www-client/chromium/chromium-121.0.6167.85.ebuild index b763322aa50c..1234ddf241c6 100644 --- a/www-client/chromium/chromium-121.0.6167.85.ebuild +++ b/www-client/chromium/chromium-121.0.6167.85.ebuild @@ -764,7 +764,7 @@ chromium_configure() { append-ldflags $(test-flags-CCLD -Wl,--undefined-version) # 641556: Force lld for lto and pgo builds, otherwise disable - if needs_lld || use lto || use pgo; then + if needs_lld || tc-ld-is-lld || use lto || use pgo; then myconf_gn+=" use_lld=true" else # This doesn't prevent lld from being used, but rather prevents gn from forcing it diff --git a/www-client/chromium/chromium-122.0.6261.6.ebuild b/www-client/chromium/chromium-122.0.6261.6.ebuild index 6fd300f560f1..cd22863412fc 100644 --- a/www-client/chromium/chromium-122.0.6261.6.ebuild +++ b/www-client/chromium/chromium-122.0.6261.6.ebuild @@ -285,7 +285,7 @@ needs_clang() { needs_lld() { # #641556: Force lld for lto and pgo builds, otherwise disable # #918897: Temporary hack w/ use arm64 - [[ ${CHROMIUM_FORCE_LLD} == yes ]] || use lto || use pgo || use arm64 + [[ ${CHROMIUM_FORCE_LLD} == yes ]] || tc-ld-is-lld || use lto || use pgo || use arm64 } llvm_check_deps() {