diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2025-05-07 10:50:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-07 10:50:49 +0200 |
| commit | 6e2c39b568e954515181b152eeaf2089cb0489ad (patch) | |
| tree | 099e6d6a90d3c4d6b97893110bdf38953c10fce1 | |
| parent | d396619af0ab229fc255c20577abfda89d337994 (diff) | |
| parent | fe64184b162cc6fc43b9e44ecaa8c065afbf7ec7 (diff) | |
| download | rust-6e2c39b568e954515181b152eeaf2089cb0489ad.tar.gz rust-6e2c39b568e954515181b152eeaf2089cb0489ad.zip | |
Rollup merge of #140398 - Berrysoft:cygwin-backtrace, r=tgross35
Fix backtrace for cygwin Closes #140304 Depends on: - [x] https://github.com/rust-lang/backtrace-rs/pull/704 This PR could not be merged until the above PR is merged. I'll update the submodule then. EDIT: submodule updated.
| m--------- | library/backtrace | 0 | ||||
| -rw-r--r-- | library/std/Cargo.toml | 2 | ||||
| -rw-r--r-- | library/windows_targets/src/lib.rs | 1 |
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 06bec74523b..0bf466f7966 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")] |