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.
This commit is contained in:
commit
6e2c39b568
3 changed files with 3 additions and 2 deletions
|
|
@ -1 +1 @@
|
|||
Subproject commit 9d2c34e7e63afe1e71c333b247065e3b7ba4d883
|
||||
Subproject commit 6c882eb11984d737f62e85f36703effaf34c2453
|
||||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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")]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue