From 7249d5f4f1fdf069c2c020fcd61b63ad032ca537 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Thu, 20 Apr 2017 13:15:11 -0400 Subject: [PATCH] add the gecko_debug feature debug_assertions is not a reliable guide to whether Gecko C++ code is being compiled with debugging assertions, since we can now compile Gecko with --enable-optimize --disable-debug --enable-rust-debug: Gecko will be compiled without debugging assertions (and debugging struct layouts) and Rust code will be compiled with debug_assertions. The struct mismatches in the binding layer lead to startup crashes. This feature is not presently used, but will be set by some Gecko-side changes and then used by some Servo-side changes. These changes need to be made first so that CI on both sides works correctly at all intermediate stages along the way. --- components/style/Cargo.toml | 1 + ports/geckolib/Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 6ea87409078..4c42919be8b 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -20,6 +20,7 @@ servo = ["serde/unstable", "serde", "serde_derive", "heapsize", "heapsize_derive "cssparser/heapsize", "cssparser/serde", "encoding", "rayon/unstable", "servo_url"] testing = [] +gecko_debug = [] [dependencies] app_units = "0.4" diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml index b035f7c496e..8148aa27ab9 100644 --- a/ports/geckolib/Cargo.toml +++ b/ports/geckolib/Cargo.toml @@ -12,6 +12,7 @@ crate-type = ["staticlib", "rlib"] [features] bindgen = ["style/use_bindgen"] testing = ["style/testing"] +gecko_debug = ["style/gecko_debug"] [dependencies] atomic_refcell = "0.1"