Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-25 09:34:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Reland #20160 since it just needed a revendor that didn't happen automatically.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2018-03-02 14:42:45 +01:00
parent b10574c06f
commit e08e0704a2
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/Cargo.toml
View file

@ -78,7 +78,7 @@ kernel32-sys = "0.2"
[build-dependencies]
lazy_static = "1"
log = "0.3"
bindgen = { version = "0.32.2", optional = true }
bindgen = { version = "0.32.3", optional = true }
regex = {version = "0.2", optional = true}
walkdir = "1.0"
toml = {version = "0.2.1", optional = true, default-features = false}

18
components/style/build_gecko.rs
View file

@ -204,15 +204,25 @@ mod bindings {
// Disable rust unions, because we replace some types inside of
// them.
//
// FIXME(emilio, bug 1432153): Make the bindings rustfmt'd on
// automation.
let mut builder = Builder::default()
.rustfmt_bindings(false)
.rust_target(RustTarget::Stable_1_0);
let rustfmt_path = env::var_os("MOZ_AUTOMATION").and_then(|_| {
env::var_os("TOOLTOOL_DIR")
}).map(PathBuf::from);
builder = match rustfmt_path {
Some(path) => {
builder.with_rustfmt(path.join("rustc").join("bin").join("rustfmt"))
},
None => {
builder.rustfmt_bindings(env::var_os("STYLO_RUSTFMT_BINDINGS").is_some())
}
};
for dir in SEARCH_PATHS.iter() {
builder = builder.clang_arg("-I").clang_arg(dir.to_str().unwrap());
}
builder = builder.include(add_include("mozilla-config.h"));
if env::var("CARGO_FEATURE_GECKO_DEBUG").is_ok() {