diff options
Diffstat (limited to 'devel/electron34/files/patch-build_config_rust.gni')
| -rw-r--r-- | devel/electron34/files/patch-build_config_rust.gni | 26 |
1 files changed, 18 insertions, 8 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 != "") |