diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2023-08-21 13:19:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-21 11:19:18 +0000 |
| commit | d6ded03a6533b7799b3a4b7fd655e5980d326ec5 (patch) | |
| tree | 3484c75c9c66544a5284d7a4604cd4a3e2bbd1c7 /python/servo | |
| parent | 078785217e816b81c8de27b7113a523ecd0fca2b (diff) | |
| download | servo-d6ded03a6533b7799b3a4b7fd655e5980d326ec5.tar.gz servo-d6ded03a6533b7799b3a4b7fd655e5980d326ec5.zip | |
Get LLVM from chocolatey (#30140)
LLVM is the largest package that we get from servo-build-deps, so
installing it via chocolatey should reduce the amount of data that we
transfer from that source. In addition, it's one less dependency that we
have to manage.
It also seems that installing LLVM to the default location with choco
means that we no longer have to set the LIBCLANG_PATH environment
variable for bindgen.
Co-authored-by: Mukilan Thiyagarajan <mukilan@igalia.com>
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/command_base.py | 9 | ||||
| -rw-r--r-- | python/servo/platform/windows.py | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 81dca475a66..0a632fc0ede 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -468,12 +468,9 @@ class CommandBase(object): effective_target = self.cross_compile_target or servo.platform.host_triple() if "msvc" in effective_target: - util.append_paths_to_env(env, "PATH", path.join(self.msvc_package_dir("llvm"), "bin")) - - # These two environment variables are necessary for building mozjs. It would - # be nice to be able to set them in the cargo configuration somehow, but they - # are platform-dependent. - env["LIBCLANG_PATH"] = path.join(self.msvc_package_dir("llvm"), "lib") + # This environment variable is necessary for building mozjs. It would + # be nice to be able to set it in the cargo configuration somehow, but it + # is platform-dependent. env["MOZILLA_BUILD"] = path.join(self.msvc_package_dir("moztools")) # Always build harfbuzz from source diff --git a/python/servo/platform/windows.py b/python/servo/platform/windows.py index 02d013bafc6..f283696ade9 100644 --- a/python/servo/platform/windows.py +++ b/python/servo/platform/windows.py @@ -19,7 +19,6 @@ from .base import Base DEPS_URL = "https://github.com/servo/servo-build-deps/releases/download/msvc-deps/" DEPENDENCIES = { - "llvm": "15.0.5", "moztools": "3.2", } |