Skip to content

Commit 6c723b8

Browse files
committed
chromium: Do not use use_lld=true / -fuse-ld=lld on whinlatter
CLANG 20+ does not like this option. Signed-off-by: Zoltán Böszörményi <[email protected]>
1 parent bc2e873 commit 6c723b8

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ SRC_URI += "\
2727
file://0010-Don-t-require-profiler_builtins.rlib.patch \
2828
file://0011-fix-check_version-Only-compare-node.js-major-version.patch \
2929
file://0012-chromium-fix-v4l2-compiler-error-on-arm.patch \
30+
${@'file://0022-Do-not-use-fuse-ld-option.patch' if d.getVar('WHINLATTER_OR_NEWER') == '1' else ''} \
3031
"
3132

3233
# ARM/AArch64-specific patches.
@@ -183,7 +184,7 @@ GN_ARGS += 'host_pkg_config="pkg-config-native"'
183184
GN_ARGS += "is_debug=false is_official_build=true"
184185

185186
# Use lld linker its quicker see https://lld.llvm.org/#performance
186-
GN_ARGS += "use_lld=true use_gold=false"
187+
GN_ARGS += "${@'' if d.getVar('WHINLATTER_OR_NEWER') == '1' else 'use_lld=true'} use_gold=false"
187188

188189
# By default, passing is_official_build=true to GN causes its symbol_level
189190
# variable to be set to "2". This means the compiler will be passed "-g2" and
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Signed-off-by: Zoltán Böszörményi <[email protected]>
2+
Upstream-Status: Inappropriate [CLANG 20+ specific]
3+
4+
--- chromium-136.0.7103.113/third_party/perfetto/gn/standalone/toolchain/BUILD.gn.old 2025-09-09 12:40:23.179245164 +0200
5+
+++ chromium-136.0.7103.113/third_party/perfetto/gn/standalone/toolchain/BUILD.gn 2025-09-09 12:42:05.799617038 +0200
6+
@@ -236,10 +236,6 @@
7+
external_cxxflags = ""
8+
external_ldflags = ""
9+
strip = ""
10+
- if (defined(invoker.linker) && invoker.linker != "") {
11+
- _invoker_linker = invoker.linker
12+
- ld_arg = "-fuse-ld=$_invoker_linker"
13+
- }
14+
if (defined(invoker.sysroot) && invoker.sysroot != "") {
15+
_invoker_sysroot = invoker.sysroot
16+
cc = "$cc --sysroot=$_invoker_sysroot"
17+
--- chromium-136.0.7103.113/third_party/instrumented_libs/noble/BUILD.gn.old 2025-09-09 12:40:12.186545761 +0200
18+
+++ chromium-136.0.7103.113/third_party/instrumented_libs/noble/BUILD.gn 2025-09-09 12:42:18.327479124 +0200
19+
@@ -121,7 +121,6 @@
20+
]
21+
package_ldflags = [
22+
"-fsanitize=memory",
23+
- "-fuse-ld=lld",
24+
"-Wl,--wrap=stat",
25+
"-Wl,--wrap=fstat",
26+
"-Wl,--wrap=lstat",

0 commit comments

Comments
 (0)