diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2024-01-15 12:18:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-15 11:18:48 +0000 |
| commit | 3c1ab6545829442d30cc8244074f59c9e857755f (patch) | |
| tree | 5ca5857c98a96aa920f42c7c0cc5cccfaa1c1fa8 /python/servo/platform | |
| parent | 97284ead14d90ca4891f709d220e4d6ee0c2f4c1 (diff) | |
| download | servo-3c1ab6545829442d30cc8244074f59c9e857755f.tar.gz servo-3c1ab6545829442d30cc8244074f59c9e857755f.zip | |
crown: Add a cargo config.toml file (#31090)
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).
Diffstat (limited to 'python/servo/platform')
| -rw-r--r-- | python/servo/platform/base.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/python/servo/platform/base.py b/python/servo/platform/base.py index 1024ab6c28f..a3909d08c11 100644 --- a/python/servo/platform/base.py +++ b/python/servo/platform/base.py @@ -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 |