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

Default to the same Cargo features in all build commands

Browse source 
Fixes #8308 and #7327.
This commit is contained in:
Matt Brubeck 2016-05-24 10:56:22 -07:00
parent e4fe0db8fd
commit 8587ec4278
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

@ -147,7 +147,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 []
@ -194,7 +194,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:
@ -265,6 +265,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,