LLVM 19.1.7

This commit is contained in:
Live session user 2025-10-15 08:01:11 -07:00
parent 47b938cf38
commit fd2576fabb
4 changed files with 5 additions and 13 deletions

View file

@ -30,7 +30,6 @@ $clangBuiltinsDirShort = Get-ShortPath $clangBuiltinsDir
$clangBuiltinsLib = Split-Path -Leaf $clangBuiltinsLibPath.FullName
$clangPath = "C:\Program Files\LLVM\bin"
#$clangPath = Get-ChildItem -Path "D:\a\rpcs3\rpcs3\llvm-*\bin"
#$llvmPath = Get-ChildItem -Path "D:\a\rpcs3\rpcs3\llvm-*\lib\cmake\llvm"
Write-Host "Found Clang builtins library: $clangBuiltinsLib in $clangBuiltinsDir or short $clangBuiltinsDirShort"
Write-Host "Found Clang Path: $clangPath"
@ -80,7 +79,6 @@ $submodules = Select-String -Path .gitmodules -Pattern 'path = (.+)' | ForEach-O
Write-Host "Updating submodules: $($submodules -join ', ')"
& git submodule update --init --quiet $submodules
& git -C 3rdparty/OpenAL/openal-soft reset --hard master
# Create and enter build directory
Write-Host "Creating build directory"

View file

@ -6,7 +6,6 @@ git config --global --add safe.directory '*'
# Note: Tried to use git submodule status, but it takes over 20 seconds
# shellcheck disable=SC2046
git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ && !/ffmpeg/ && !/curl/ && !/FAudio/ && !/zlib/ { print $3 }' .gitmodules)
git -C 3rdparty/OpenAL/openal-soft reset --hard master
mkdir build && cd build || exit 1

View file

@ -5,8 +5,8 @@ defaults:
shell: bash
on:
push:
#branches:
# - master # Only trigger push event on 'master' branch
branches:
- master # Only trigger push event on 'master' branch
pull_request:
workflow_dispatch:
@ -337,7 +337,7 @@ jobs:
compiler: clang
arch: win64
- compiler: clang-cl
llvmver: 20.1.8
llvmver: 19.1.7
arch: win64
env:
@ -350,7 +350,6 @@ jobs:
uses: actions/checkout@main
with:
fetch-depth: 0
- name: Setup msys2
uses: msys2/setup-msys2@v2
if: ${{ matrix.compiler == 'clang' }}
@ -387,7 +386,6 @@ jobs:
run: |
git clone https://github.com/microsoft/vcpkg.git
.\vcpkg\bootstrap-vcpkg.bat
- name: Restore vcpkg cache
if: ${{ matrix.compiler == 'clang-cl' }}
uses: actions/cache/restore@main
@ -437,15 +435,14 @@ jobs:
path: ./llvm-${{ matrix.llvmver }}
key: ${{ runner.os }}-llvm-dl-cache-${{ hashFiles('**/llvm-${{ matrix.llvmver }}') }}
restore-keys: ${{ runner.os }}-clang-dl-cache-
- name: Add LLVM
if: ${{ matrix.compiler == 'clang-cl' }}
shell: pwsh
run: |
if (!(Test-Path -Path D:\a\rpcs3\rpcs3\llvm-${{ matrix.llvmver }}\)) {
rm -r llvm-*
curl -fsSLO https://github.com/vovkos/llvm-package-windows/releases/download/llvm-20.1.8/llvm-20.1.8-windows-amd64-msvc17-msvcrt.7z
curl -fsSLO https://github.com/vovkos/llvm-package-windows/releases/download/clang-20.1.8/clang-20.1.8-windows-amd64-msvc17-msvcrt.7z
curl -fsSLO https://github.com/vovkos/llvm-package-windows/releases/download/llvm-${{ matrix.llvmver }}/llvm-${{ matrix.llvmver }}-windows-amd64-msvc17-msvcrt.7z
curl -fsSLO https://github.com/vovkos/llvm-package-windows/releases/download/clang-${{ matrix.llvmver }}/clang-${{ matrix.llvmver }}-windows-amd64-msvc17-msvcrt.7z
7z x llvm-*.7z
mv llvm* llvm-${{ matrix.llvmver }}
rm llvm-*.7z
@ -455,7 +452,6 @@ jobs:
}
Add-Content -Path $env:GITHUB_PATH -Value "D:\a\rpcs3\rpcs3\llvm-${{ matrix.llvmver }}\bin"
C:\PROGRA~1\LLVM\bin\clang-cl.exe --version
- name: Save LLVM Cache
if: ${{ matrix.compiler == 'clang-cl' && steps.llvm-cache.outputs.cache-hit != 'true' }}
#if: github.ref == 'refs/heads/master'

View file

@ -5,7 +5,6 @@ if(NOT USE_SYSTEM_ZSTD)
option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
option(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON)
option(ZSTD_BUILD_TESTS "BUILD TESTS" OFF)
add_subdirectory(zstd/build/cmake EXLUDE_FROM_ALL)
add_library(3rdparty_zstd INTERFACE)
target_link_libraries(3rdparty_zstd INTERFACE libzstd_static)