Skip to content

Commit

Permalink
Remove dynamic allocation of atomic
Browse files Browse the repository at this point in the history
Since #1925 building static binaries fails because of a hardcoded `dylib`.
Removing the `dylib` but still let rust search for the dependency it
will still link it.

This should still keep #1645 fixed but also fixes #2043.

I have tested this by building Vaultwarden for both dynamically linked
debian based image, and a statically linked musl/alpine based image.
But are using OpenSSL v3.x.x.
  • Loading branch information
BlackDex committed Nov 14, 2023
1 parent 730aaed commit b1b0acf
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion openssl-sys/build/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ fn main() {
|| env::var("CARGO_CFG_TARGET_OS").unwrap() == "android")
&& env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap() == "32"
{
println!("cargo:rustc-link-lib=dylib=atomic");
println!("cargo:rustc-link-lib=atomic");
}

if kind == "static" && target.contains("windows") {
Expand Down

0 comments on commit b1b0acf

Please sign in to comment.