From b17491f7f1087703a2519a9004cb7fbdba6c5fbf Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Wed, 26 Apr 2023 16:40:53 +0100 Subject: rust: Upgrade 1.68.2 -> 1.69.0 Rebase patches, drop crossbeam_atomic is this fully merged upstream. https://blog.rust-lang.org/2023/04/20/Rust-1.69.0.html (From OE-Core rev: 39e05f9b0fdc3f76f8b80a12989f78614bc9ea5c) Signed-off-by: Alex Kiernan Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/files/hardcodepaths.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'meta/recipes-devtools/rust/files/hardcodepaths.patch') diff --git a/meta/recipes-devtools/rust/files/hardcodepaths.patch b/meta/recipes-devtools/rust/files/hardcodepaths.patch index cb99e8b011..19c494ad9a 100644 --- a/meta/recipes-devtools/rust/files/hardcodepaths.patch +++ b/meta/recipes-devtools/rust/files/hardcodepaths.patch @@ -4,12 +4,11 @@ to resolve these issues properly upstream. Upstream-Status: Inappropriate [patches need rework] Signed-off-by: Richard Purdie +Signed-off-by: Alex Kiernan -Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs -=================================================================== ---- rustc-1.66.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs -+++ rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs -@@ -160,46 +160,6 @@ pub unsafe fn create_module<'ll>( +--- rustc-1.69.0-src/compiler/rustc_codegen_llvm/src/context.rs.orig 2023-04-21 08:38:23.092458478 +0100 ++++ rustc-1.69.0-src/compiler/rustc_codegen_llvm/src/context.rs 2023-04-21 08:39:00.266819755 +0100 +@@ -156,46 +156,6 @@ } } @@ -39,7 +38,7 @@ Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs - // - // FIXME(#34960) - let cfg_llvm_root = option_env!("CFG_LLVM_ROOT").unwrap_or(""); -- let custom_llvm_used = cfg_llvm_root.trim() != ""; +- let custom_llvm_used = !cfg_llvm_root.trim().is_empty(); - - if !custom_llvm_used && target_data_layout != llvm_data_layout { - bug!( -- cgit v1.2.3-54-g00ecf