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

Fix sover detection for 0-based versioning #346

Merged
merged 1 commit into from
Sep 30, 2023
Merged

Fix sover detection for 0-based versioning #346

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
21 changes: 11 additions & 10 deletions src/target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ impl Target {
let os = &self.os;
let env = &self.env;

let sover = if major == 0 {
format!("{major}.{minor}")
} else {
format!("{major}")
};

if os == "android" {
lines.push(format!("-Wl,-soname,lib{lib_name}.so"));
} else if os == "linux"
Expand All @@ -78,20 +84,15 @@ impl Target {
|| os == "haiku"
|| os == "illumos"
{
if capi_config.library.versioning {
lines.push(format!("-Wl,-soname,lib{lib_name}.so.{major}"));
lines.push(if capi_config.library.versioning {
format!("-Wl,-soname,lib{lib_name}.so.{sover}")
} else {
lines.push(format!("-Wl,-soname,lib{lib_name}.so"));
}
format!("-Wl,-soname,lib{lib_name}.so")
});
} else if os == "macos" || os == "ios" {
let line = if capi_config.library.versioning {
let install_ver = if major == 0 {
format!("{major}.{minor}")
} else {
format!("{major}")
};
format!("-Wl,-install_name,{1}/lib{0}.{5}.dylib,-current_version,{2}.{3}.{4},-compatibility_version,{5}",
lib_name, libdir.display(), major, minor, patch, install_ver)
lib_name, libdir.display(), major, minor, patch, sover)
} else {
format!(
"-Wl,-install_name,{1}/lib{0}.dylib",
Expand Down