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

mach: Fix cross-build check when using asan

Browse source 
When using asan the target_override is enabled,
but we can also still be cross-compiling.
Swapping the order fixes the cross-build
detection in combination with asan.

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
Jonathan Schwender 2025-05-29 15:21:40 +08:00
parent c6e37e83e4
commit 979304e493
No known key found for this signature in database
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
python/servo/command_base.py
View file

@ -803,15 +803,16 @@ class CommandBase(object):
"--manifest-path", "--manifest-path",
path.join(self.context.topdir, "ports", "servoshell", "Cargo.toml"), path.join(self.context.topdir, "ports", "servoshell", "Cargo.toml"),
] ]
if target_override:
args += ["--target", target_override] if self.target.is_cross_build():
elif self.target.is_cross_build():
args += ["--target", self.target.triple()] args += ["--target", self.target.triple()]
if type(self.target) in [AndroidTarget, OpenHarmonyTarget]: if type(self.target) in [AndroidTarget, OpenHarmonyTarget]:
# Note: in practice `cargo rustc` should just be used unconditionally. # 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" assert command != "build", "For Android / OpenHarmony `cargo rustc` must be used instead of cargo build"
if command == "rustc": if command == "rustc":
args += ["--lib", "--crate-type=cdylib"] args += ["--lib", "--crate-type=cdylib"]
elif target_override:
args += ["--target", target_override]
features = [] features = []