diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index 8bcb5baf4afc..3d17e99277c4 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -1,21 +1,21 @@
 # Run update.sh to update to the latest nightly
 PORTVERSION=	1.89.0.${NIGHTLY_DATE:C,-,,g}
 # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust
 PORTREVISION=	0
 PKGNAMESUFFIX=	-nightly
 DISTNAME=	rustc-nightly-src
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	upstream does not provide bootstraps for other architectures
 
 CONFLICTS_INSTALL=	rust
 
 MASTERDIR=	${.CURDIR}/../rust
 PATCHDIR=	${.CURDIR}/files
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
-NIGHTLY_DATE=		2025-05-26
-BOOTSTRAPS_DATE=	2025-05-12
+NIGHTLY_DATE=		2025-06-09
+BOOTSTRAPS_DATE=	2025-05-26
 RUST_BOOTSTRAP_VERSION=	beta
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index f4592890e273..218b080eb3d1 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1748343065
-SHA256 (rust/2025-05-26/rustc-nightly-src.tar.xz) = 33a1aa7e10e591abe3e1c5315163f33f56fd3da50bb0df4660f3a3ad00407b60
-SIZE (rust/2025-05-26/rustc-nightly-src.tar.xz) = 282590168
-SHA256 (rust/2025-05-12/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 6930ccd83b6b63d0a876eb5ac52c32a8449fd4cea8666b919494ce6358c6122c
-SIZE (rust/2025-05-12/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88300072
-SHA256 (rust/2025-05-12/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = a930b94bc005ce2b09b4d67abf47bfeafad8c7ab6ca5c15acc10e023818e7b25
-SIZE (rust/2025-05-12/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 27730396
-SHA256 (rust/2025-05-12/cargo-beta-x86_64-unknown-freebsd.tar.xz) = d8f73cb808471883a5f6ee8db3dd5165fff5084ae744f4ffdca89fb545faaba8
-SIZE (rust/2025-05-12/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10575040
+TIMESTAMP = 1749561822
+SHA256 (rust/2025-06-09/rustc-nightly-src.tar.xz) = c7693f6c7185f7a2d078e55f03231b5be8865ebe17bcd721c3e096f3d0b83c6d
+SIZE (rust/2025-06-09/rustc-nightly-src.tar.xz) = 266636952
+SHA256 (rust/2025-05-26/rustc-beta-x86_64-unknown-freebsd.tar.xz) = b8f921568dbca553484936adb267d384b8ce6bfd40efa0b54d22cd98a6638c43
+SIZE (rust/2025-05-26/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88310892
+SHA256 (rust/2025-05-26/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 9e7477e05192ce11190e9b1291a5e171a9cd9da9ca2f4c53d08b98025a697255
+SIZE (rust/2025-05-26/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 27694316
+SHA256 (rust/2025-05-26/cargo-beta-x86_64-unknown-freebsd.tar.xz) = ff50d29e650cf85f6aadee0618ffef15ac4f3c9b30f02f9a678129e9bf8f5ad3
+SIZE (rust/2025-05-26/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 10581172
diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs
index fcbf2f47c9ca..a556833eed1e 100644
--- a/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs
+++ b/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs
@@ -1,14 +1,14 @@
---- src/bootstrap/src/core/config/config.rs.orig	2025-04-01 18:22:03 UTC
+--- src/bootstrap/src/core/config/config.rs.orig	2025-06-08 20:17:28 UTC
 +++ src/bootstrap/src/core/config/config.rs
-@@ -3016,9 +3016,9 @@ impl Config {
+@@ -1459,9 +1459,9 @@ impl Config {
                      || source_version.minor == stage0_version.minor + 1)))
          {
              let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
 -            fail(&format!(
 +            eprintln!(
                  "Unexpected {component_name} version: {stage0_version}, we should use {prev_version}/{source_version} to build source with {source_version}"
 -            ));
 +            );
          }
      }
  
diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs
index 207c262c004a..759b8ab321cd 100644
--- a/lang/rust-nightly/files/patch-vendor_cc.rs
+++ b/lang/rust-nightly/files/patch-vendor_cc.rs
@@ -1,75 +1,114 @@
 When the compiler has "clang" in its name the cc crate will pass
 an LLVM target triple to it.  Rust uses a triple that lacks the OS
 version and LLVM will default to FreeBSD 9 behavior, i.e., it will
 default to libstdc++ which is no longer available in newer releases.
 
 To avoid this issue assume we have a GNU compatible toolchain instead
 until LLVM can be updated to use libc++ by default.
 
 https://reviews.llvm.org/D77776
 
---- vendor/cc-1.0.99/src/tool.rs.orig	2024-12-10 13:16:09 UTC
-+++ vendor/cc-1.0.99/src/tool.rs
-@@ -167,9 +167,7 @@ impl Tool {
+--- vendor/cc-1.1.18/src/tool.rs.orig	2025-06-08 20:17:28 UTC
++++ vendor/cc-1.1.18/src/tool.rs
+@@ -174,9 +174,7 @@ impl Tool {
  
-             match (clang, accepts_cl_style_flags, gcc) {
-                 (clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
--                (true, false, _) => Ok(ToolFamily::Clang {
+             match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
+                 (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
+-                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
 -                    zig_cc: is_zig_cc(path, cargo_output),
 -                }),
-+                (true, false, _) => Ok(ToolFamily::Gnu),
-                 (false, false, true) => Ok(ToolFamily::Gnu),
-                 (false, false, false) => {
-                     cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
++                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
+                 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
+                 (false, false, false, false, false) => {
+                     cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
 --- vendor/cc-1.2.0/src/tool.rs.orig	2024-12-10 13:16:09 UTC
 +++ vendor/cc-1.2.0/src/tool.rs
 @@ -174,9 +174,7 @@ impl Tool {
  
              match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
                  (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
 -                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
 -                    zig_cc: is_zig_cc(path, cargo_output),
 -                }),
++                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
+                 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
+                 (false, false, false, false, false) => {
+                     cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
+--- vendor/cc-1.2.13/src/tool.rs.orig	2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.13/src/tool.rs
+@@ -141,9 +141,7 @@ impl Tool {
+ 
+             match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
+                 (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
+-                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
+-                    zig_cc: is_zig_cc(path, cargo_output),
+-                }),
 +                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
                  (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                  (false, false, false, false, false) => {
                      cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
 --- vendor/cc-1.2.16/src/tool.rs.orig	2025-04-01 18:22:03 UTC
 +++ vendor/cc-1.2.16/src/tool.rs
 @@ -141,9 +141,7 @@ impl Tool {
  
              match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
                  (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
 -                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
 -                    zig_cc: is_zig_cc(path, cargo_output),
 -                }),
++                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
+                 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
+                 (false, false, false, false, false) => {
+                     cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
+--- vendor/cc-1.2.19/src/tool.rs.orig	2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.19/src/tool.rs
+@@ -141,9 +141,7 @@ impl Tool {
+ 
+             match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
+                 (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
+-                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
+-                    zig_cc: is_zig_cc(path, cargo_output),
+-                }),
++                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
+                 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
+                 (false, false, false, false, false) => {
+                     cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
+--- vendor/cc-1.2.20/src/tool.rs.orig	2025-04-01 18:22:03 UTC
++++ vendor/cc-1.2.20/src/tool.rs
+@@ -141,9 +141,7 @@ impl Tool {
+ 
+             match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
+                 (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
+-                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
+-                    zig_cc: is_zig_cc(path, cargo_output),
+-                }),
 +                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
                  (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                  (false, false, false, false, false) => {
                      cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
 --- vendor/cc-1.2.22/src/tool.rs.orig	2025-04-01 18:22:03 UTC
 +++ vendor/cc-1.2.22/src/tool.rs
 @@ -141,9 +141,7 @@ impl Tool {
  
              match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
                  (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
 -                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
 -                    zig_cc: is_zig_cc(path, cargo_output),
 -                }),
 +                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
                  (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                  (false, false, false, false, false) => {
                      cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
 --- vendor/cc-1.2.23/src/tool.rs.orig	2025-04-01 18:22:03 UTC
 +++ vendor/cc-1.2.23/src/tool.rs
 @@ -141,9 +141,7 @@ impl Tool {
  
              match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
                  (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
 -                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
 -                    zig_cc: is_zig_cc(path, cargo_output),
 -                }),
 +                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
                  (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                  (false, false, false, false, false) => {
                      cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");