about summary refs log tree commit diff
diff options
context:
space:
mode:
author王宇逸 <Strawberry_Str@hotmail.com>2025-04-28 22:48:45 +0800
committer王宇逸 <Strawberry_Str@hotmail.com>2025-05-07 13:08:19 +0800
commitfe64184b162cc6fc43b9e44ecaa8c065afbf7ec7 (patch)
tree34b013b2d129f6f2417273df3f0239c4358754bf
parenta932eb36f8adf6c8cdfc450f063943da3112d621 (diff)
downloadrust-fe64184b162cc6fc43b9e44ecaa8c065afbf7ec7.tar.gz
rust-fe64184b162cc6fc43b9e44ecaa8c065afbf7ec7.zip
Fix backtrace for cygwin
m---------library/backtrace0
-rw-r--r--library/std/Cargo.toml2
-rw-r--r--library/windows_targets/src/lib.rs1
3 files changed, 2 insertions, 1 deletions
diff --git a/library/backtrace b/library/backtrace
-Subproject 9d2c34e7e63afe1e71c333b247065e3b7ba4d88
+Subproject 6c882eb11984d737f62e85f36703effaf34c245
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
index 602af4a0447..778f77e8eaf 100644
--- a/library/std/Cargo.toml
+++ b/library/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/library/windows_targets/src/lib.rs b/library/windows_targets/src/lib.rs
index c7d158584eb..bce54c5ffce 100644
--- a/library/windows_targets/src/lib.rs
+++ b/library/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")]