Update mozangle, cc, and cmake

This also moves some environment variable configuration to the shared
`build_env()` method, because previously clang was only being chosen for
running `./mach build` and not `./mach test-unit` which was leading to
rebuilds and thus build failures when running `test-unit`. I guess the
cmake crate does not expect the compiler to change between subsequent
runs.
This commit is contained in:
Martin Robinson 2023-06-29 12:45:45 +02:00
parent a725380db0
commit ddc7994673
No known key found for this signature in database
GPG key ID: D56AA4FA55EFE6F8
4 changed files with 25 additions and 18 deletions

View file

@ -31,6 +31,8 @@ from mach.decorators import (
CommandProvider,
Command,
)
import servo.util
import tidy
from servo.command_base import (
@ -260,10 +262,20 @@ class MachCommands(CommandBase):
if nocapture:
args += ["--", "--nocapture"]
# We are setting is_build here to true, because running `cargo test` can trigger builds.
env = self.build_env(is_build=True)
# on MSVC, we need some DLLs in the path. They were copied
# in to the servo.exe build dir, so just point PATH to that.
# TODO(mrobinson): This should be removed entirely.
if "msvc" in servo.platform.host_triple():
servo.util.prepend_paths_to_env(
env, "PATH", path.dirname(self.get_binary_path(False, False)))
return self.run_cargo_build_like_command(
"bench" if bench else "test",
args,
env=self.build_env(test_unit=True),
env=env,
with_layout_2020=with_layout_2020,
**kwargs)