aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-04-22 18:40:47 -0500
committerGitHub <noreply@github.com>2017-04-22 18:40:47 -0500
commitf795eb1a8b7443ea9dc1cf1c81a6ac0484894659 (patch)
treec5d4cc8fe4d761454448e67ad4999eedd1b05951 /python/servo
parentbb86bb8514ee4d39d048b1a8d7048a6d269d4d97 (diff)
parent7c6fda8ea996111424340cac05fff10d551b4e69 (diff)
downloadservo-f795eb1a8b7443ea9dc1cf1c81a6ac0484894659.tar.gz
servo-f795eb1a8b7443ea9dc1cf1c81a6ac0484894659.zip
Auto merge of #16550 - froydnj:gecko-bindings-gecko-debug, r=froydnj
switch gecko_bindings over to the gecko_debug feature [DO NOT MERGE] ...so that they use the correct Gecko structs regardless of whether Rust code is being compiled with debug assertions or not. This is the second part of the Servo-side changes for https://bugzilla.mozilla.org/show_bug.cgi?id=1357556 - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes do not require tests because building is a sufficient test. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16550) <!-- Reviewable:end -->
Diffstat (limited to 'python/servo')
-rw-r--r--python/servo/build_commands.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index efed18c609e..792b6071145 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -417,8 +417,9 @@ class MachCommands(CommandBase):
ret = None
opts = []
+ features = []
if with_gecko is not None:
- opts += ["--features", "bindgen"]
+ features += ["bindgen"]
env["MOZ_DIST"] = path.abspath(path.expanduser(with_gecko))
if jobs is not None:
opts += ["-j", jobs]
@@ -426,6 +427,11 @@ class MachCommands(CommandBase):
opts += ["-v"]
if release:
opts += ["--release"]
+ else:
+ features += ["gecko_debug"]
+
+ if features:
+ opts += ["--features", ' '.join(features)]
if with_gecko is not None:
print("Generating atoms data...")