diff options
author | Martin Robinson <mrobinson@igalia.com> | 2023-06-29 12:45:45 +0200 |
---|---|---|
committer | Martin Robinson <mrobinson@igalia.com> | 2023-06-30 09:46:45 +0200 |
commit | ddc79946733cdfed32f5366ba7138f1d91dc2ea2 (patch) | |
tree | cd4c8c7c10f69fb1bceb59dc37fcd9bb7e020079 /python/servo/build_commands.py | |
parent | a725380db0b9fba31993409f7d0f4b2d11ca8f7d (diff) | |
download | servo-ddc79946733cdfed32f5366ba7138f1d91dc2ea2.tar.gz servo-ddc79946733cdfed32f5366ba7138f1d91dc2ea2.zip |
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.
Diffstat (limited to 'python/servo/build_commands.py')
-rw-r--r-- | python/servo/build_commands.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 1cf23237807..d56246f9c1d 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -118,7 +118,6 @@ class MachCommands(CommandBase): self.ensure_clobbered() build_start = time() - env["CARGO_TARGET_DIR"] = target_path host = servo.platform.host_triple() target_triple = self.cross_compile_target or servo.platform.host_triple() @@ -401,10 +400,6 @@ class MachCommands(CommandBase): for key in env: print((key, env[key])) - if sys.platform != "win32": - env.setdefault("CC", "clang") - env.setdefault("CXX", "clang++") - status = self.run_cargo_build_like_command( "build", opts, env=env, verbose=verbose, libsimpleservo=libsimpleservo, **kwargs |