Use resolver v2

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

View file

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

View file

@ -897,7 +897,7 @@ install them, let us know by filing a bug!")
target, android = self.pick_target_triple(target, android, magicleap)
args = []
if "--manifest-path" not in args:
if "--manifest-path" not in cargo_args:
if libsimpleservo or android:
if android:
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
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:
features.append("debugmozjs")
if not magicleap: