diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
| commit | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (patch) | |
| tree | ad799ccacfb459b809b02b9c115ed4befb93b4c1 /www/iridium/files/patch-build_config_rust.gni | |
| parent | 0b1510fe1f98f82da6f3481cb6c58957022d9211 (diff) | |
| parent | b057c68280a2f2a7b3d1fbac36f7b034e1fdf593 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/main
Diffstat (limited to 'www/iridium/files/patch-build_config_rust.gni')
| -rw-r--r-- | www/iridium/files/patch-build_config_rust.gni | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/www/iridium/files/patch-build_config_rust.gni b/www/iridium/files/patch-build_config_rust.gni index 886ac9542b5e..67f69c98dbe6 100644 --- a/www/iridium/files/patch-build_config_rust.gni +++ b/www/iridium/files/patch-build_config_rust.gni @@ -1,13 +1,15 @@ ---- build/config/rust.gni.orig 2025-06-19 07:37:57 UTC +--- build/config/rust.gni.orig 2025-09-11 13:19:19 UTC +++ build/config/rust.gni -@@ -361,6 +361,10 @@ if (is_linux || is_chromeos) { +@@ -369,7 +369,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) +} + - assert(!toolchain_has_rust || rust_abi_target != "") ++if (toolchain_has_rust && !is_bsd) { + assert(rust_abi_target != "") - # This variable is passed to the Rust libstd build. + _known_rust_target_triples_filepath = "//build/rust/known-target-triples.txt" |