From fd2576fabbc7ba666fec6973cc716134786ed744 Mon Sep 17 00:00:00 2001 From: Live session user Date: Wed, 15 Oct 2025 08:01:11 -0700 Subject: [PATCH] LLVM 19.1.7 --- .ci/build-windows-clang-cl.ps1 | 2 -- .ci/build-windows-clang.sh | 1 - .github/workflows/rpcs3.yml | 14 +++++--------- 3rdparty/zstd/CMakeLists.txt | 1 - 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.ci/build-windows-clang-cl.ps1 b/.ci/build-windows-clang-cl.ps1 index 367f2feaed..19200974e5 100644 --- a/.ci/build-windows-clang-cl.ps1 +++ b/.ci/build-windows-clang-cl.ps1 @@ -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" diff --git a/.ci/build-windows-clang.sh b/.ci/build-windows-clang.sh index 75054cc66b..06482dd63a 100644 --- a/.ci/build-windows-clang.sh +++ b/.ci/build-windows-clang.sh @@ -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 diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 2d5b29acf1..7630729902 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -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' diff --git a/3rdparty/zstd/CMakeLists.txt b/3rdparty/zstd/CMakeLists.txt index 5bf68692c3..e0454c9ea9 100644 --- a/3rdparty/zstd/CMakeLists.txt +++ b/3rdparty/zstd/CMakeLists.txt @@ -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)