From aa227ae9c4b6ae5361d68ef7804bd314805e8a2c Mon Sep 17 00:00:00 2001 From: GabCoolDude Date: Sun, 12 Jan 2025 21:01:11 +0100 Subject: [PATCH] Use LLVM 19 to try and fix macos builds not working:tm: --- .github/workflows/canary.yml | 6 +++--- distribution/macos/create_macos_build_ava.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index b352e82d7..baf8815a7 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -21,7 +21,7 @@ env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 RYUJINX_BASE_VERSION: "1.2" RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "canary" - RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev" + RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GabCoolDude" RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx" RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx-Canary" RELEASE: 1 @@ -223,11 +223,11 @@ jobs: with: global-json-file: global.json - - name: Setup LLVM 15 + - name: Setup LLVM 17 run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 15 + sudo ./llvm.sh 17 - name: Install rcodesign run: | diff --git a/distribution/macos/create_macos_build_ava.sh b/distribution/macos/create_macos_build_ava.sh index b19fa4863..de6fab358 100755 --- a/distribution/macos/create_macos_build_ava.sh +++ b/distribution/macos/create_macos_build_ava.sh @@ -67,11 +67,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_ if ! [ -x "$(command -v lipo)" ]; then - if ! [ -x "$(command -v llvm-lipo-14)" ]; + if ! [ -x "$(command -v llvm-lipo-17)" ]; then LIPO=llvm-lipo else - LIPO=llvm-lipo-14 + LIPO=llvm-lipo-17 fi else LIPO=lipo