diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/electron39/files/patch-build_config_rust.gni | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/electron39/files/patch-build_config_rust.gni')
| -rw-r--r-- | devel/electron39/files/patch-build_config_rust.gni | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/devel/electron39/files/patch-build_config_rust.gni b/devel/electron39/files/patch-build_config_rust.gni new file mode 100644 index 000000000000..ff6e49252fef --- /dev/null +++ b/devel/electron39/files/patch-build_config_rust.gni @@ -0,0 +1,25 @@ +--- build/config/rust.gni.orig 2025-10-24 16:42:30 UTC ++++ build/config/rust.gni +@@ -62,7 +62,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") + + # Whether artifacts produced by the Rust compiler can participate in ThinLTO. + # +@@ -329,7 +330,11 @@ if (is_linux || is_chromeos) { + } + } + +-if (toolchain_has_rust) { ++if (is_bsd) { ++ rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os) ++} ++ ++if (toolchain_has_rust && !is_bsd) { + assert(rust_abi_target != "") + + _known_rust_target_triples_filepath = "//build/rust/known-target-triples.txt" |