From d6ded03a6533b7799b3a4b7fd655e5980d326ec5 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Mon, 21 Aug 2023 13:19:18 +0200 Subject: [PATCH] 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 --- .github/workflows/windows.yml | 2 ++ python/servo/command_base.py | 9 +++------ python/servo/platform/windows.py | 1 - support/windows/chocolatey.config | 1 + 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9eed5821361..b7a4eedc1c1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -53,6 +53,8 @@ jobs: Start-BitsTransfer -Source https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip -Destination C:\\wix311-binaries.zip Expand-Archive C:\\wix311-binaries.zip -DestinationPath C:\\wix echo "C:\\wix" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Remove msys from PATH # see https://github.com/actions/runner-images/issues/2208 + run: Remove-Item -LiteralPath "C:\msys64\" -Force -Recurse - name: ccache uses: hendrikmuhs/ccache-action@v1.2 - name: Bootstrap 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", } diff --git a/support/windows/chocolatey.config b/support/windows/chocolatey.config index 65293c28757..f69736afc99 100644 --- a/support/windows/chocolatey.config +++ b/support/windows/chocolatey.config @@ -2,6 +2,7 @@ +