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 <[email protected]>
johu · Jan 28, 2024 · 388df07 · 388df07
1 parent 41b7f20
commit 388df07
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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() {