summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rust/files/hardcodepaths.patch
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2023-12-29 11:44:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-12-30 11:03:08 +0000
commit8fd396bc3dc18101bc0e9cc34b7ed25d24b6cfea (patch)
tree0bf2dcb9a6588b88ef85abfaf5bbd4b561ce72e7 /meta/recipes-devtools/rust/files/hardcodepaths.patch
parent537ed2b654bbc44a84ad193feffee967355f6c65 (diff)
downloadpoky-8fd396bc3dc18101bc0e9cc34b7ed25d24b6cfea.tar.gz
rust: Upgrade 1.73.0 -> 1.74.0
Replace musl fixes with backports from upstream. Add sysconfdir to config.toml to fix: | thread 'main' panicked at install.rs:92:9: | User doesn't have write access on `install.sysconfdir` path in `config.toml`. https://blog.rust-lang.org/2023/11/16/Rust-1.74.0.html (From OE-Core rev: 84f46dd2503bb0ef238fef0097c66fda88f6cbda) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rust/files/hardcodepaths.patch')
-rw-r--r--meta/recipes-devtools/rust/files/hardcodepaths.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-devtools/rust/files/hardcodepaths.patch b/meta/recipes-devtools/rust/files/hardcodepaths.patch
index 6eb091461f..a043095f62 100644
--- a/meta/recipes-devtools/rust/files/hardcodepaths.patch
+++ b/meta/recipes-devtools/rust/files/hardcodepaths.patch
@@ -1,4 +1,4 @@
1When building for the target, some build paths end up embedded in the binaries. 1When building for the target, some build paths end up embedded in the binaries.
2These changes remove that. Further investigation is needed to work out the way 2These changes remove that. Further investigation is needed to work out the way
3to resolve these issues properly upstream. 3to resolve these issues properly upstream.
4 4
@@ -6,19 +6,19 @@ Upstream-Status: Inappropriate [patches need rework]
6Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 6Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
7Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> 7Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
8 8
9Index: rustc-1.73.0-src/compiler/rustc_codegen_llvm/src/context.rs 9diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs
10=================================================================== 10index b4b2ab1e1f8a..8bb3e3f0557c 100644
11--- rustc-1.73.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs 11--- a/compiler/rustc_codegen_llvm/src/context.rs
12+++ rustc-1.73.0-src/compiler/rustc_codegen_llvm/src/context.rs 12+++ b/compiler/rustc_codegen_llvm/src/context.rs
13@@ -157,46 +157,6 @@ pub unsafe fn create_module<'ll>( 13@@ -158,46 +158,6 @@ pub unsafe fn create_module<'ll>(
14 } 14 }
15 } 15 }
16 16
17- // Ensure the data-layout values hardcoded remain the defaults. 17- // Ensure the data-layout values hardcoded remain the defaults.
18- if sess.target.is_builtin { 18- if sess.target.is_builtin {
19- // tm is disposed by its drop impl
19- let tm = crate::back::write::create_informational_target_machine(tcx.sess); 20- let tm = crate::back::write::create_informational_target_machine(tcx.sess);
20- llvm::LLVMRustSetDataLayoutFromTargetMachine(llmod, tm); 21- llvm::LLVMRustSetDataLayoutFromTargetMachine(llmod, &tm);
21- llvm::LLVMRustDisposeTargetMachine(tm);
22- 22-
23- let llvm_data_layout = llvm::LLVMGetDataLayoutStr(llmod); 23- let llvm_data_layout = llvm::LLVMGetDataLayoutStr(llmod);
24- let llvm_data_layout = str::from_utf8(CStr::from_ptr(llvm_data_layout).to_bytes()) 24- let llvm_data_layout = str::from_utf8(CStr::from_ptr(llvm_data_layout).to_bytes())