Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow Windows dylibs without dll suffix. #8310

Merged
merged 1 commit into from
Jun 2, 2020
Merged

Allow Windows dylibs without dll suffix. #8310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/cargo/core/compiler/build_context/target_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,9 @@ impl TargetInfo {

// Window shared library import/export files.
if crate_type.is_dynamic() {
if target_triple.ends_with("-windows-msvc") {
assert!(suffix == ".dll");
// Note: Custom JSON specs can alter the suffix. For now, we'll
// just ignore non-DLL suffixes.
if target_triple.ends_with("-windows-msvc") && suffix == ".dll" {
// See https://docs.microsoft.com/en-us/cpp/build/reference/working-with-import-libraries-and-export-files
// for more information about DLL import/export files.
ret.push(FileType {
Expand All @@ -318,8 +319,7 @@ impl TargetInfo {
crate_type: Some(crate_type.clone()),
should_replace_hyphens: true,
});
} else if target_triple.ends_with("windows-gnu") {
assert!(suffix == ".dll");
} else if target_triple.ends_with("windows-gnu") && suffix == ".dll" {
// See https://cygwin.com/cygwin-ug-net/dll.html for more
// information about GNU import libraries.
// LD can link DLL directly, but LLD requires the import library.
Expand Down