mirror of
https://github.com/servo/servo.git
synced 2025-06-09 00:53:26 +00:00
Auto merge of #29947 - mrobinson:update-mozangle, r=jdm
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. Fixes #29674 --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because they do not change behavior. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
commit
47faf83a1e
4 changed files with 25 additions and 18 deletions
|
@ -32,6 +32,8 @@ from mach.decorators import (
|
|||
CommandProvider,
|
||||
Command,
|
||||
)
|
||||
|
||||
import servo.util
|
||||
import tidy
|
||||
|
||||
from servo.command_base import (
|
||||
|
@ -245,10 +247,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)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue