Rollup merge of rust-lang#140398 - Berrysoft:cygwin-backtrace, r=tgross35

GuillaumeGomez · web-flow · commit 7afeb04ecc87 · 2025-05-07T10:50:49.000+02:00
Fix backtrace for cygwin Closes rust-lang#140304 Depends on: - [x] rust-lang/backtrace-rs#704 This PR could not be merged until the above PR is merged. I'll update the submodule then. EDIT: submodule updated.
diff --git a/backtrace b/backtrace
@@ -1 +1 @@
-Subproject commit 9d2c34e7e63afe1e71c333b247065e3b7ba4d883
+Subproject commit 6c882eb11984d737f62e85f36703effaf34c2453
diff --git a/std/Cargo.toml b/std/Cargo.toml
@@ -57,7 +57,7 @@ object = { version = "0.36.0", default-features = false, optional = true, featur
     'archive',
 ] }
 
-[target.'cfg(windows)'.dependencies.windows-targets]
+[target.'cfg(any(windows, target_os = "cygwin"))'.dependencies.windows-targets]
 path = "../windows_targets"
 
 [dev-dependencies]
diff --git a/windows_targets/src/lib.rs b/windows_targets/src/lib.rs
@@ -34,6 +34,7 @@ pub macro link {
 }
 
 #[cfg(not(feature = "windows_raw_dylib"))]
+#[cfg(not(target_os = "cygwin"))] // Cygwin doesn't need these libs
 #[cfg_attr(target_vendor = "win7", link(name = "advapi32"))]
 #[link(name = "ntdll")]
 #[link(name = "userenv")]

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit 9d2c34e7e63afe1e71c333b247065e3b7ba4d883`
	`1`	`+Subproject commit 6c882eb11984d737f62e85f36703effaf34c2453`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ pub macro link {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`#[cfg(not(feature = "windows_raw_dylib"))]`
	`37`	`+#[cfg(not(target_os = "cygwin"))] // Cygwin doesn't need these libs`
`37`	`38`	`#[cfg_attr(target_vendor = "win7", link(name = "advapi32"))]`
`38`	`39`	`#[link(name = "ntdll")]`
`39`	`40`	`#[link(name = "userenv")]`