diff options
Diffstat (limited to 'devel/electron34/files')
| -rw-r--r-- | devel/electron34/files/patch-build_config_rust.gni | 26 | ||||
| -rw-r--r-- | devel/electron34/files/patch-build_rust_std_BUILD.gn | 16 |
2 files changed, 30 insertions, 12 deletions
diff --git a/devel/electron34/files/patch-build_config_rust.gni b/devel/electron34/files/patch-build_config_rust.gni index 693d21f030d8..c4b8cb874d33 100644 --- a/devel/electron34/files/patch-build_config_rust.gni +++ b/devel/electron34/files/patch-build_config_rust.gni @@ -1,13 +1,23 @@ ---- build/config/rust.gni.orig 2025-01-27 17:37:37 UTC +--- build/config/rust.gni.orig 2025-02-24 19:59:26 UTC +++ build/config/rust.gni -@@ -298,6 +298,10 @@ if (is_linux || is_chromeos) { - } - } +@@ -69,7 +69,8 @@ declare_args() { + # set this to the output of `rustc -V`. Changing this string will cause all + # Rust targets to be rebuilt, which allows you to update your toolchain and + # not break incremental builds. +- rustc_version = "" ++ rustc_version = exec_script("//build/gn_run_binary.py", ++ [ "${LOCALBASE}/bin/rustc", "-V" ], "trim string") -+if (is_bsd) { -+ rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os) + # If you're using a Rust toolchain as specified by rust_sysroot_absolute, + # you can specify whether it supports nacl here. +@@ -296,6 +297,10 @@ if (is_linux || is_chromeos) { + } else { + assert(false, "Architecture not supported") + } +} + - assert(!toolchain_has_rust || rust_abi_target != "") ++if (is_bsd) { ++ rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os) + } - # This variable is passed to the Rust libstd build. + assert(!toolchain_has_rust || rust_abi_target != "") diff --git a/devel/electron34/files/patch-build_rust_std_BUILD.gn b/devel/electron34/files/patch-build_rust_std_BUILD.gn index 7314d062a541..a832cbab6e35 100644 --- a/devel/electron34/files/patch-build_rust_std_BUILD.gn +++ b/devel/electron34/files/patch-build_rust_std_BUILD.gn @@ -30,7 +30,15 @@ # List of Rust stdlib rlibs which are present in the official Rust toolchain # we are using from the Android team. This is usually a version or two behind # nightly. Generally this matches the toolchain we build ourselves, but if -@@ -74,13 +51,20 @@ if (toolchain_has_rust) { +@@ -66,7 +43,6 @@ if (toolchain_has_rust) { + "rustc_demangle", + "std_detect", + "test", +- "unicode_width", + "unwind", + ] + +@@ -74,13 +50,20 @@ if (toolchain_has_rust) { # These are no longer present in the Windows toolchain. stdlib_files += [ "addr2line", @@ -52,7 +60,7 @@ } if (toolchain_for_rust_host_build_tools) { -@@ -100,7 +84,6 @@ if (toolchain_has_rust) { +@@ -100,7 +83,6 @@ if (toolchain_has_rust) { # don't need to pass to the C++ linker because they're used for specialized # purposes. skip_stdlib_files = [ @@ -60,7 +68,7 @@ "rustc_std_workspace_alloc", "rustc_std_workspace_core", "rustc_std_workspace_std", -@@ -254,8 +237,6 @@ if (toolchain_has_rust) { +@@ -254,8 +236,6 @@ if (toolchain_has_rust) { foreach(libname, stdlib_files + skip_stdlib_files) { deps += [ "rules:$libname" ] } @@ -69,7 +77,7 @@ } } else { action("find_stdlib") { -@@ -381,12 +362,6 @@ if (toolchain_has_rust) { +@@ -381,12 +361,6 @@ if (toolchain_has_rust) { ":stdlib_public_dependent_libs", ] deps = [ ":prebuilt_rustc_copy_to_sysroot" ] |