Skip to content

Fix BOTAN_INCLUDE_DIR usage #179

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
butteronarchbtw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix BOTAN_INCLUDE_DIR usage #179

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
28 changes: 19 additions & 9 deletions botan-sys/build/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,25 @@ fn find_botan_include_dir() -> std::path::PathBuf {

#[cfg(not(feature = "pkg-config"))]
{
fn find_in_basedir(basedir: PathBuf) -> Option<PathBuf> {
for major_version in [3, 2] {
let dir = PathBuf::from(format!("botan-{major_version}"));
let inc_dir = basedir.join(dir.clone());
if inc_dir.exists() {
return Some(inc_dir);
}
}
None
}

if let Some(dir) = env_var("BOTAN_INCLUDE_DIR") {
return dir.into();
let Some(dir) = find_in_basedir(dir.into()) else {
panic!("BOTAN_INCLUDE_DIR does not point to a valid location");
};
return dir;
}

fn possible_header_locations() -> Vec<std::path::PathBuf> {
fn possible_header_locations() -> Vec<PathBuf> {
let dirs = [
"/opt/homebrew/include",
"/usr/local/include",
Expand All @@ -197,13 +211,9 @@ fn find_botan_include_dir() -> std::path::PathBuf {
paths
}

for major_version in [3, 2] {
let dir = PathBuf::from(format!("botan-{major_version}"));
for basedir in possible_header_locations() {
let inc_dir = basedir.join(dir.clone());
if inc_dir.exists() {
return inc_dir;
}
for basedir in possible_header_locations() {
if let Some(dir) = find_in_basedir(basedir) {
return dir;
}
}

Expand Down
Loading