Skip to content

Commit 701272a

Browse files
MaxIhlenfeldtotavio
authored andcommitted
move toolchain_supports_rust_thin_lto patch to backports
1 parent 5534f7c commit 701272a

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ SRC_URI += "\
2020
file://backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch \
2121
file://backport/IWYU-for-content-browser-generic_sensor-fra.patch \
2222
file://backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch \
23+
file://backport/Make-toolchain_supports_rust_thin_lto-configurable.patch \
2324
"
2425
# Non-specific patches.
2526
SRC_URI += "\
@@ -47,7 +48,6 @@ SRC_URI += "\
4748
file://0022-Use-base-ranges-instead-of-std-ranges.patch \
4849
file://0023-Use-the-correct-path-to-libclang_rt.builtins.a.patch \
4950
file://0024-Adjust-the-Rust-build-to-our-needs.patch \
50-
file://0025-Make-toolchain_supports_rust_thin_lto-configurable.patch \
5151
"
5252
# ARM/AArch64-specific patches.
5353
SRC_URI:append:arm = "\
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
From d5a13b62ce90ebc1490e8546a8caef664e727dd7 Mon Sep 17 00:00:00 2001
22
From: Max Ihlenfeldt <max@igalia.com>
33
Date: Thu, 18 Jan 2024 17:25:32 +0000
4-
Subject: [PATCH] Make toolchain_supports_rust_thin_lto configurable
4+
Subject: [PATCH] Backport "Make toolchain_supports_rust_thin_lto configurable"
55

6-
This makes toolchain_supports_rust_thin_lto a configurable GN arg, and
7-
also always passes `-Cembed-bitcode=no` to rustc if it is true.
6+
This backports a patch needed to make our Rust build setup work. It will
7+
be included in upstream's 123 release.
88

9-
This is useful when using an external Rust toolchain with a different
10-
LLVM version than clang.
11-
12-
Upstream-Status: Pending
9+
Upstream-Status: Backport [https://crrev.com/c/5233602]
1310
Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1411
---
1512
build/config/compiler/BUILD.gn | 2 +-

0 commit comments

Comments
 (0)