Skip to content

[AIX] use /usr to find_openssl_dir #2401

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[AIX] use /usr to find_openssl_dir #2401

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
4 changes: 2 additions & 2 deletions openssl-sys/build/find_normal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ fn find_openssl_dir(target: &str) -> OsString {
try_pkg_config();
try_vcpkg();

// FreeBSD and OpenBSD ship with Libre|OpenSSL but don't include a pkg-config file
if host == target && (target.contains("freebsd") || target.contains("openbsd")) {
// FreeBSD, OpenBSD, and AIX ship with Libre|OpenSSL but don't include a pkg-config file
Copy link
Contributor

Choose a reason for hiding this comment

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

Tangential, but OpenBSD has shipped pkg-config files for libcrypto, libssl and openssl since 2010. I don't know if this early return is useful or needed. The reason given for it certainly isn't correct.

Copy link
Author

Choose a reason for hiding this comment

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

Fair enough, I can tweak the rationale if you like:

Suggested change
// FreeBSD, OpenBSD, and AIX ship with Libre|OpenSSL but don't include a pkg-config file
// FreeBSD, OpenBSD, and AIX ship with Libre|OpenSSL

if host == target && (target.contains("freebsd") || target.contains("openbsd") || target.contains("aix")) {
return OsString::from("/usr");
}

Expand Down
Loading