Skip to content

Commit 40ebd7f

Browse files
kirkstone: chromium: Don't require profiler_builtins.rlib (#799)
chromium: Don't require profiler_builtins.rlib Backport '0019-Don-t-require-profiler_builtins.rlib.patch' from master branch. This fixes Chromium compilation errors, when using 'meta-lts-mixins' layer with latest revision from 'kirkstone/rust' branch (Rust 1.75). Signed-off-by: Daniel Semkowicz <dse@thaumatec.com>
1 parent dcd2073 commit 40ebd7f

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ SRC_URI += "\
4242
file://0016-Use-base-ranges-instead-of-std-ranges.patch \
4343
file://0017-Use-the-correct-path-to-libclang_rt.builtins.a.patch \
4444
file://0018-Adjust-the-Rust-build-to-our-needs.patch \
45+
file://0019-Don-t-require-profiler_builtins.rlib.patch \
4546
"
4647
# ARM/AArch64-specific patches.
4748
SRC_URI:append:arm = "\
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 7f9a0877029aa3492fd381313886d9c80efbb752 Mon Sep 17 00:00:00 2001
2+
From: Max Ihlenfeldt <max@igalia.com>
3+
Date: Wed, 7 Feb 2024 11:58:30 +0000
4+
Subject: [PATCH] Don't require profiler_builtins.rlib
5+
6+
This library is only needed for profiling builds, which we don't do.
7+
Including it leads to compile errors on with OE's current master branch
8+
because they disabled building the library, so just skip it.
9+
10+
Upstream-Status: Inappropriate [specific to our build setup]
11+
Signed-off-by: Max Ihlenfeldt <max@igalia.com>
12+
---
13+
build/rust/std/BUILD.gn | 1 -
14+
1 file changed, 1 deletion(-)
15+
16+
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
17+
index 77f4b8c..3078de8 100644
18+
--- a/build/rust/std/BUILD.gn
19+
+++ b/build/rust/std/BUILD.gn
20+
@@ -100,7 +100,6 @@ if (toolchain_has_rust) {
21+
# don't need to pass to the C++ linker because they're used for specialized
22+
# purposes.
23+
skip_stdlib_files = [
24+
- "profiler_builtins",
25+
"rustc_std_workspace_alloc",
26+
"rustc_std_workspace_core",
27+
"rustc_std_workspace_std",

0 commit comments

Comments
 (0)