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.

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

check for libraries in lib64, if it exists #1582

Merged
merged 1 commit into from
Dec 26, 2021

Conversation

alex
Copy link
Collaborator

@alex alex commented Dec 13, 2021

fixes #1581

let mut lib_dirs = vec![];
// OpenSSL 3.0 now puts it's libraries in lib64/ by default,
// check for both it and lib/.
if openssl_dir.join("lib64").exists() {
Copy link
Owner

Choose a reason for hiding this comment

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

It should be fine to just unconditionally return both paths I think.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

That's how I originally wrote the code, but then determine_kind calls read_dir on it and I'd have to add error handling there so just checking for existence on the front seemed easier and more consistent.

Copy link
Owner

Choose a reason for hiding this comment

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

Ugh, determine_kind is such an unfortunate function...

@sfackler sfackler merged commit 16f6512 into sfackler:master Dec 26, 2021
@alex alex deleted the check-lib64 branch December 26, 2021 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OPENSSL_DIR does not work with OpenSSL 3.0
3 participants