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

Update to the latest bindgen #3

Merged
merged 1 commit into from
Mar 1, 2017
Merged

Update to the latest bindgen #3

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ keywords = ["ffi", "libffi", "closure", "c"]
[dependencies]

[build-dependencies]
bindgen = "0.18"
bindgen = "0.22"
make-cmd = "0.1"
51 changes: 26 additions & 25 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,56 +7,57 @@ use std::process::Command;

use make_cmd::make;

const LIBFFI_DIR: &'static str = "libffi";
const LIBFFI_DIR: &'static str = "libffi";

fn main() {
let out_dir = env::var("OUT_DIR").unwrap();
let out_dir = env::var("OUT_DIR").unwrap();

let build_dir = Path::new(LIBFFI_DIR);
let prefix = Path::new(&out_dir).join("libffi-root");
let include = Path::new(&prefix).join("lib")
.join("libffi-3.2.1")
.join("include");
let libdir = Path::new(&prefix).join("lib");
let prefix = Path::new(&out_dir).join("libffi-root");
let include = Path::new(&prefix)
.join("lib")
.join("libffi-3.2.1")
.join("include");
let libdir = Path::new(&prefix).join("lib");

fn run_command(which: &'static str, cmd: &mut Command) {
assert!(cmd.status().expect(which).success(), which);
}

// Generate configure, run configure, make, make install
run_command("Generating configure",
Command::new("./autogen.sh")
.current_dir(&build_dir));
Command::new("./autogen.sh").current_dir(&build_dir));
run_command("Configuring libffi",
Command::new("./configure")
.arg("--disable-docs")
.arg("--prefix")
.arg(prefix)
.current_dir(&build_dir));
.arg("--disable-docs")
.arg("--prefix")
.arg(prefix)
.current_dir(&build_dir));
run_command("Building libffi",
make()
.arg("install")
.current_dir(&build_dir));
.arg("install")
.current_dir(&build_dir));

// Now run bindgen.

let include_file = Path::new("include").join("include_ffi.h");
let out_file = Path::new("src").join("generated.rs");

let mut builder = bindgen::Builder::default();
builder.header(include_file.display().to_string());
builder.clang_arg(format!("-I{}", include.display()));

let bindings = builder.generate().expect("
let builder = bindgen::Builder::default();
builder.header(include_file.display().to_string())
.clang_arg(format!("-I{}", include.display()))
.no_unstable_rust()
.generate()
.expect("
**********
Bindgen generation failed. Please file a bug report.
Bindgen generation failed. Please file a bug \
report.
**********
");
bindings.write_to_file(out_file.display().to_string())
.expect("bindgen output");
")
.write_to_file(out_file.display().to_string())
.expect("bindgen output");

// Cargo linking directives
println!("cargo:rustc-link-lib=ffi");
println!("cargo:rustc-link-search={}", libdir.display());
}