Skip to content
Permalink
Browse files

Backed out changeset 39a71f4c9d94 for build bustages at make[4]: *** …

…[force-cargo-library-build] Error 101 on a CLOSED TREE

Backs out #20160
  • Loading branch information...
Gecko Backout authored and moz-servo-sync committed Mar 2, 2018
1 parent 0172989 commit 59cb14b71b68a1bd5292621c543155e7ec990045
Showing with 9 additions and 20 deletions.
  1. +4 −5 Cargo.lock
  2. +1 −1 components/style/Cargo.toml
  3. +4 −14 components/style/build_gecko.rs

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -78,7 +78,7 @@ kernel32-sys = "0.2"
[build-dependencies]
lazy_static = "1"
log = "0.3"
bindgen = { version = "0.32.3", optional = true }
bindgen = { version = "0.32.2", optional = true }
regex = {version = "0.2", optional = true}
walkdir = "1.0"
toml = {version = "0.2.1", optional = true, default-features = false}
@@ -204,25 +204,15 @@ 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() {

0 comments on commit 59cb14b

Please sign in to comment.
You can’t perform that action at this time.