Auto merge of rust-lang#781 - shinglyu:linux32, r=emilio

Passing additional clang arguments for Linux 32 cross compiling This is for https://bugzilla.mozilla.org/show_bug.cgi?id=1366050 But it has to wait for KyleMayes/clang-sys#57 to land and version number bumped. (I'm making up the new version numbers for now.) r? @emilio
emilio · Jul 4, 2017 · d0df1b9 · d0df1b9
2 parents 1cbb5d3 + ee478a1
commit d0df1b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,7 +45,7 @@ quasi_codegen = "0.32"
 [dependencies]
 cexpr = "0.2"
 cfg-if = "0.1.0"
-clang-sys = { version = "0.18.0", features = ["runtime", "clang_3_9"] }
+clang-sys = { version = "0.19.0", features = ["runtime", "clang_3_9"] }
 lazy_static = "0.2.1"
 peeking_take_while = "0.1.2"
 syntex_syntax = "0.58"

diff --git a/src/lib.rs b/src/lib.rs
@@ -1063,7 +1063,7 @@ impl<'ctx> Bindings<'ctx> {
         options.build();
 
         // TODO: Make this path fixup configurable?
-        if let Some(clang) = clang_sys::support::Clang::find(None) {
+        if let Some(clang) = clang_sys::support::Clang::find(None, &options.clang_args) {
             // If --target is specified, assume caller knows what they're doing
             // and don't mess with include paths for them
             let has_target_arg = options.clang_args