Fix ANGLE platform toolchain dependencies
This commit is contained in:
1 parent
dc22cf9fca
commit
eaa0e54a93
2 files changed
+19
-1
No files matched your search
@@ -35,7 +35,7 @@ jobs:
|
|||||||
- name: Install native build dependencies
|
- name: Install native build dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y clang lld llvm g++ ninja-build pkg-config libfontconfig1-dev libglib2.0-dev libx11-dev libxcb1-dev
|
sudo apt-get install -y clang lld llvm g++ ninja-build pkg-config libfontconfig1-dev libglib2.0-dev libpci-dev libx11-dev libxcb1-dev
|
||||||
|
|
||||||
- name: Build Linux static graphics libraries
|
- name: Build Linux static graphics libraries
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -19,6 +19,24 @@ $SkiaDepsRetries = if ($env:SKIA_DEPS_RETRIES) { [int]$env:SKIA_DEPS_RETRIES } e
|
|||||||
if (-not $env:DEPOT_TOOLS_WIN_TOOLCHAIN) {
|
if (-not $env:DEPOT_TOOLS_WIN_TOOLCHAIN) {
|
||||||
$env:DEPOT_TOOLS_WIN_TOOLCHAIN = "0"
|
$env:DEPOT_TOOLS_WIN_TOOLCHAIN = "0"
|
||||||
}
|
}
|
||||||
|
if ($env:DEPOT_TOOLS_WIN_TOOLCHAIN -eq "0") {
|
||||||
|
if (-not $env:GYP_MSVS_VERSION) {
|
||||||
|
$env:GYP_MSVS_VERSION = "2022"
|
||||||
|
}
|
||||||
|
if (-not $env:GYP_MSVS_OVERRIDE_PATH) {
|
||||||
|
if ($env:VSINSTALLDIR) {
|
||||||
|
$env:GYP_MSVS_OVERRIDE_PATH = $env:VSINSTALLDIR.TrimEnd("\", "/")
|
||||||
|
} else {
|
||||||
|
$vswhere = Join-Path ${env:ProgramFiles(x86)} "Microsoft Visual Studio\Installer\vswhere.exe"
|
||||||
|
if (Test-Path $vswhere) {
|
||||||
|
$vsPath = & $vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
|
||||||
|
if ($vsPath) {
|
||||||
|
$env:GYP_MSVS_OVERRIDE_PATH = $vsPath.TrimEnd("\", "/")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function Require-Command($Name) {
|
function Require-Command($Name) {
|
||||||
if (-not (Get-Command $Name -ErrorAction SilentlyContinue)) {
|
if (-not (Get-Command $Name -ErrorAction SilentlyContinue)) {
|
||||||
|
|||||||
Reference in new issue
Block a user