Merge pull request rust-lang#243 from abbradar/include-path

Add bundled Clang includes in default options

Author: crabtw

src/bin/bindgen.rs

@@ -162,14 +162,6 @@ pub fn main() {
     let mut bind_args: Vec<_> = env::args().collect();
     let bin = bind_args.remove(0);
 
-    match bindgen::get_include_dir() {
-        Some(path) => {
-            bind_args.push("-I".to_owned());
-            bind_args.push(path);
-        }
-        None => (),
-    }
-
     match parse_args(&bind_args[..]) {
         ParseResult::ParseErr(e) => panic!(e),
         ParseResult::CmdUsage => print_usage(bin),

src/lib.rs

@@ -116,7 +116,10 @@ impl Default for BindgenOptions {
             emit_ast: false,
             fail_on_unknown_type: false,
             override_enum_ty: "".to_string(),
-            clang_args: Vec::new()
+            clang_args: match get_include_dir() {
+                Some(path) => vec!("-idirafter".to_owned(), path),
+                None => Vec::new()
+            }
         }
     }
 }