Skip to content

Commit

Permalink
Auto merge of #45 - fitzgen:use-docopt-for-args, r=emilio
Browse files Browse the repository at this point in the history
Append the input header to the end of the clang args, instead of the front

r @emilio
  • Loading branch information
bors-servo committed Aug 30, 2016
2 parents 0af8bd5 + 82b166d commit 1e26a8a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/bin/bindgen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down Expand Up @@ -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))
}
Expand Down

0 comments on commit 1e26a8a

Please sign in to comment.