Skip to content

fix systool crash when no clang args are given #112

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: develop
Choose a base branch
from
Open

fix systool crash when no clang args are given #112

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
8 changes: 5 additions & 3 deletions sys/tool/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::path::Path;
use std::path::PathBuf;

/// Generate lv2-sys bindings and write them to out.
pub fn generate_bindings<I>(source_dir: &Path, out: &Path, clang_args: I)
pub fn generate_bindings<I>(source_dir: &Path, out: &Path, clang_args: Option<I>)
where
I: IntoIterator,
I::Item: AsRef<str>,
Expand All @@ -16,7 +16,9 @@ where
.whitelist_var("LV2.*")
.layout_tests(false)
.bitfield_enum("LV2_State_Flags");
bindings = bindings.clang_args(clang_args);
if let Some(clang_args) = clang_args {
bindings = bindings.clang_args(clang_args);
}

// Adding the headers to the include path of clang.
// Otherwise, included headers can not be found.
Expand Down Expand Up @@ -93,7 +95,7 @@ fn main() {

let headers = PathBuf::from(".").join(matches.value_of("LV2").unwrap());
let out = PathBuf::from(".").join(matches.value_of("out").unwrap());
let clang_args = matches.values_of("clang args").unwrap();
let clang_args = matches.values_of("clang args");

generate_bindings(&headers, &out, clang_args);
}