From 1f2b66e2d77ffbe75f9d7487db0b90fa724c4692 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 30 Nov 2017 16:52:08 +0100 Subject: Use workspace.default-members to specify default crates for 'cargo build' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … and 'cargo test', etc. Include Servo and its unit tests, but not Stylo because that would try to compile the style crate with incompatible feature flags: https://github.com/rust-lang/cargo/issues/4463 `workspace.default-members` was added in https://github.com/rust-lang/cargo/pull/4743. Older Cargo versions ignore it. --- python/servo/build_commands.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'python/servo/build_commands.py') diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 2ec27f00364..ea6ddca8725 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -402,8 +402,7 @@ class MachCommands(CommandBase): self.ensure_clobbered() ret = None - opts = [] - opts += ["--manifest-path", self.cef_manifest()] + opts = ["-p", "embedding"] if jobs is not None: opts += ["-j", jobs] @@ -458,8 +457,7 @@ class MachCommands(CommandBase): env = self.build_env(is_build=True, geckolib=True) ret = None - opts = [] - opts += ["--manifest-path", self.geckolib_manifest()] + opts = ["-p", "geckoservo"] features = [] if jobs is not None: -- cgit v1.2.3