summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-08-30 13:38:06 -0500
committerGitHub <noreply@github.com>2016-08-30 13:38:06 -0500
commit1e26a8a0ef76656dc3567eb68a954a701fbb42c8 (patch)
tree2bc1cc22c66f81041c2092b030d8990f5c333d58 /src
parent0af8bd514838b70fb3bc1d99738b5ff5ab7d7662 (diff)
parent82b166d73928ec8e6033a6a0fe410719eb29f316 (diff)
Auto merge of #45 - fitzgen:use-docopt-for-args, r=emilio
Append the input header to the end of the clang args, instead of the front r @emilio
Diffstat (limited to 'src')
-rwxr-xr-xsrc/bin/bindgen.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bin/bindgen.rs b/src/bin/bindgen.rs
index fbd3c457..4ea2cd91 100755
--- a/src/bin/bindgen.rs
+++ b/src/bin/bindgen.rs
@@ -143,8 +143,6 @@ impl Into<ParseResult<(BindgenOptions, Box<io::Write>)>> for Args {
fn into(mut self) -> Result<(BindgenOptions, Box<io::Write>), String> {
let mut options: BindgenOptions = Default::default();
- options.clang_args.push(self.arg_input_header);
-
for lib in self.flag_link.drain(..) {
options.links.push((lib, LinkType::Default));
}
@@ -186,6 +184,7 @@ impl Into<ParseResult<(BindgenOptions, Box<io::Write>)>> for Args {
options.opaque_types.extend(self.flag_opaque_type.drain(..));
options.blacklist_type.extend(self.flag_blacklist_type.drain(..));
options.clang_args.extend(self.arg_clang_args.drain(..));
+ options.clang_args.push(self.arg_input_header);
Ok((options, out))
}