Skip to content

Commit d0df1b9

Browse files
author
bors-servo
authored
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
2 parents 1cbb5d3 + ee478a1 commit d0df1b9

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

Cargo.lock

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ quasi_codegen = "0.32"
4545
[dependencies]
4646
cexpr = "0.2"
4747
cfg-if = "0.1.0"
48-
clang-sys = { version = "0.18.0", features = ["runtime", "clang_3_9"] }
48+
clang-sys = { version = "0.19.0", features = ["runtime", "clang_3_9"] }
4949
lazy_static = "0.2.1"
5050
peeking_take_while = "0.1.2"
5151
syntex_syntax = "0.58"

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ impl<'ctx> Bindings<'ctx> {
10631063
options.build();
10641064

10651065
// TODO: Make this path fixup configurable?
1066-
if let Some(clang) = clang_sys::support::Clang::find(None) {
1066+
if let Some(clang) = clang_sys::support::Clang::find(None, &options.clang_args) {
10671067
// If --target is specified, assume caller knows what they're doing
10681068
// and don't mess with include paths for them
10691069
let has_target_arg = options.clang_args

0 commit comments

Comments
 (0)