Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-27 09:10:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #11378 - mbrubeck:debug-mozjs, r=larsbergstrom

Browse source 
Default to the same Cargo features in all build commands

Fixes #8308 and #7327. r? @larsbergstrom

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11378)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-05-27 17:15:24 -05:00
commit 2d4941660b
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python/servo/build_commands.py
View file

@ -151,7 +151,7 @@ class MachCommands(CommandBase):
features=None, android=None, verbose=False, debug_mozjs=False, params=None):
if android is None:
android = self.config["build"]["android"]
features = features or []
features = features or self.servo_features()
opts = params or []
@ -198,7 +198,7 @@ class MachCommands(CommandBase):
self.ensure_bootstrapped(target=target)
if debug_mozjs or self.config["build"]["debug-mozjs"]:
if debug_mozjs:
features += ["script/debugmozjs"]
if features:
@ -271,6 +271,10 @@ class MachCommands(CommandBase):
if release:
opts += ["--release"]
servo_features = self.servo_features()
if servo_features:
opts += ["--features", "%s" % ' '.join("servo/" + x for x in servo_features)]
build_start = time()
with cd(path.join("ports", "cef")):
ret = call(["cargo", "build"] + opts,