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

rebuild openssl-sys if the underlying openssl has changed #2157

Merged
merged 3 commits into from
Feb 10, 2024
Merged

rebuild openssl-sys if the underlying openssl has changed #2157

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67f955c
rebuild openssl-sys if the underlying openssl has changed
reaperhulk Jan 30, 2024
69ff6dd
only rebuild if the openssl include changes, not any include
reaperhulk Jan 30, 2024
54621a9
increase elegance 20%
reaperhulk Jan 30, 2024
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
5 changes: 5 additions & 0 deletions openssl-sys/build/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ fn main() {
let target = env::var("TARGET").unwrap();

let (lib_dirs, include_dir) = find_openssl(&target);
let mut ossl_include_dir = include_dir.clone();
ossl_include_dir.push("openssl");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can just be let ossl_include_dir = include_dir.join("openssl"); as far as I can tell

if let Some(printable_include) = ossl_include_dir.to_str() {
println!("cargo:rerun-if-changed={}", printable_include);
}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've considered doing something like this before, but I think it's a bit dangerous. With this specific setup, include_dir will be e.g. /usr/include on a system-wide install so you'd rebuild any time you updated any system header.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the PR to use <include>/openssl


if !lib_dirs.iter().all(|p| Path::new(p).exists()) {
panic!("OpenSSL library directory does not exist: {:?}", lib_dirs);
Expand Down
Loading