From 19034d9dff316d42e534d05a959b918e46d1e494 Mon Sep 17 00:00:00 2001 From: nastys Date: Wed, 29 Jun 2022 01:25:08 +0200 Subject: [PATCH] fix macos ci --- .ci/build-mac.sh | 6 +++--- .ci/deploy-mac.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index 0f63a08605..f195a96c36 100755 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -7,9 +7,9 @@ export MACOSX_DEPLOYMENT_TARGET=11.6 export CXX=clang++ export CC=clang export Qt5_DIR="/usr/local/opt/qt@5/lib/cmake/Qt5" -export PATH="/usr/local/opt/llvm/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin" -export LDFLAGS="-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib" -export CPPFLAGS="-I/usr/local/opt/llvm/include -msse -msse2 -mcx16 -no-pie" +export PATH="/usr/local/opt/llvm@13/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin" +export LDFLAGS="-L/usr/local/opt/llvm@13/lib -Wl,-rpath,/usr/local/opt/llvm@13/lib" +export CPPFLAGS="-I/usr/local/opt/llvm@13/include -msse -msse2 -mcx16 -no-pie" git submodule update --init --recursive --depth 1 diff --git a/.ci/deploy-mac.sh b/.ci/deploy-mac.sh index 0bd2e7e4b9..a52a65be58 100755 --- a/.ci/deploy-mac.sh +++ b/.ci/deploy-mac.sh @@ -14,7 +14,7 @@ echo "AVVER=$AVVER" >> ../.ci/ci-vars.env cd bin mkdir "rpcs3.app/Contents/lib/" -cp "/usr/local/opt/llvm/lib/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib" +cp "/usr/local/opt/llvm@13/lib/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib" rm -rf "rpcs3.app/Contents/Frameworks/QtPdf.framework" \ "rpcs3.app/Contents/Frameworks/QtQml.framework" \ "rpcs3.app/Contents/Frameworks/QtQmlModels.framework" \