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

crown: Add a cargo config.toml file (#31090)

Browse source 
This makes it more foolproof to install crown from inside the Servo
directory, because the root Servo config.toml overrides the rustc to use
crown (an obvious circular dependency).
This commit is contained in:
Martin Robinson 2024-01-15 12:18:48 +01:00 • committed by GitHub
parent 97284ead14
commit 3c1ab65458
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
python/servo/platform/base.py
View file

@ -96,13 +96,8 @@ class Base:
return True
def install_crown(self, force: bool) -> bool:
# We need to override the rustc set in cargo/config.toml because crown
# may not be installed yet.
env = dict(os.environ)
env["CARGO_BUILD_RUSTC"] = "rustc"
print(" * Installing crown (the Servo linter)...")
if subprocess.call(["cargo", "install", "--path", "support/crown"], env=env) != 0:
if subprocess.call(["cargo", "install", "--path", "support/crown"]) != 0:
raise EnvironmentError("Installation of crown failed.")
return True