aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/command_base.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r--python/servo/command_base.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index abd193eda49..f0f28e5488e 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -305,6 +305,7 @@ class CommandBase(object):
self.config["build"].setdefault("incremental", None)
self.config["build"].setdefault("webgl-backtrace", False)
self.config["build"].setdefault("dom-backtrace", False)
+ self.config["build"].setdefault("with_asan", False)
self.config.setdefault("android", {})
self.config["android"].setdefault("sdk", "")
@@ -803,15 +804,16 @@ class CommandBase(object):
"--manifest-path",
path.join(self.context.topdir, "ports", "servoshell", "Cargo.toml"),
]
- if target_override:
- args += ["--target", target_override]
- elif self.target.is_cross_build():
+
+ if self.target.is_cross_build():
args += ["--target", self.target.triple()]
if type(self.target) in [AndroidTarget, OpenHarmonyTarget]:
# Note: in practice `cargo rustc` should just be used unconditionally.
assert command != "build", "For Android / OpenHarmony `cargo rustc` must be used instead of cargo build"
if command == "rustc":
args += ["--lib", "--crate-type=cdylib"]
+ elif target_override:
+ args += ["--target", target_override]
features = []