Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use resolver v2

Browse source
This commit is contained in:
sagudev 2023-05-07 13:57:20 +02:00
parent bee09efcc5
commit c2778b9bef
2 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -1,4 +1,5 @@
[workspace] [workspace]
resolver = "2"
members = [ members = [
"ports/winit", "ports/winit",
"ports/gstplugin", "ports/gstplugin",

4
python/servo/command_base.py
View file

@ -897,7 +897,7 @@ install them, let us know by filing a bug!")
target, android = self.pick_target_triple(target, android, magicleap) target, android = self.pick_target_triple(target, android, magicleap)
args = [] args = []
if "--manifest-path" not in args: if "--manifest-path" not in cargo_args:
if libsimpleservo or android: if libsimpleservo or android:
if android: if android:
api = "jniapi" api = "jniapi"
@ -915,6 +915,8 @@ install them, let us know by filing a bug!")
if features is None: # If we're passed a list, mutate it even if it's empty if features is None: # If we're passed a list, mutate it even if it's empty
features = [] features = []
if "-p" not in cargo_args: # We're building specific package, that may not have features
if self.config["build"]["debug-mozjs"] or debug_mozjs: if self.config["build"]["debug-mozjs"] or debug_mozjs:
features.append("debugmozjs") features.append("debugmozjs")
if not magicleap: if not magicleap: