Skip to content

CI: Bump LLVM version on macOS to v21 - #17630

Merged
Megamouse merged 8 commits into
RPCS3:masterfrom
shinra-electric:mac-llvm-bump
Oct 29, 2025
Merged

Megamouse merged 8 commits into
RPCS3:masterfrom
shinra-electric:mac-llvm-bump

Conversation

@shinra-electric

@shinra-electric shinra-electric commented Oct 26, 2025 •

Copy link
Copy Markdown
Contributor

Fixes #17530
Fixes #17597
Fixes #17563
Probably fixes #17587

Testing:
Both x86 and Arm macOS builds should work

  • Arm build
  • x86 build

Ready for review

@shinra-electric
shinra-electric marked this pull request as draft October 26, 2025 07:51
@shinra-electric shinra-electric changed the title Build: Bump LLVM version on macOS to v21 CI: Bump LLVM version on macOS to v21 Oct 26, 2025
@Megamouse Megamouse added OS: macOS Build and CI Anything related to the build process and continuous integration labels Oct 26, 2025
@qurious-pixel

Copy link
Copy Markdown
Contributor

this works better for the final linkage:

# shellcheck disable=SC2155
export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib,-L$(brew --prefix llvm)/lib/c++"

@shinra-electric

shinra-electric commented Oct 26, 2025 •

Copy link
Copy Markdown
Contributor Author

this works better for the final linkage:

# shellcheck disable=SC2155
export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib,-L$(brew --prefix llvm)/lib/c++"

Ok, I'll let the CI finish and then make that change.

I left the optimise script there, so I'm not sure if that will cause issues. I'll comment it out if it acts up.
The optimise script leaves a lot of spam in the log, but it's not causing anything to fail.

@shinra-electric

shinra-electric commented Oct 26, 2025 •

Copy link
Copy Markdown
Contributor Author

CI is passing, and the Arm build seems to be working.
Screenshot 2025-10-26 at 17 09 55

The x86 build is passing, but I was not able to run it under Rosetta.
Someone with an Intel Mac needs to confirm if it's working or not.

@shinra-electric

shinra-electric commented Oct 26, 2025 •

Copy link
Copy Markdown
Contributor Author

this works better for the final linkage:

# shellcheck disable=SC2155
export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib,-L$(brew --prefix llvm)/lib/c++"

The x86 build is failing because the rpath for c++ lib is wrong. Do you think that's related to your change there?
Library not loaded: @rpath/libc++abi.1.dylib

It's found in RPCS3.app/Contents/lib/libc++abi.1.dylib

Edit:
Running otool -L on the exe shows it's looking in Frameworks, not lib
@executable_path/../Frameworks/libc++.1.dylib (compatibility version 1.0.0, current version 1.0.0)

Edit 2:
On the Arm build it's in Frameworks

@qurious-pixel

qurious-pixel commented Oct 26, 2025 •

Copy link
Copy Markdown
Contributor

The x86 build is failing because the rpath for c++ lib is wrong. Do you think that's related to your change there? Library not loaded: @rpath/libc++abi.1.dylib

It's found in RPCS3.app/Contents/lib/libc++abi.1.dylib

It's in Framework too, but that rpath is not correct. it should be @executable_path/../Frameworks/libc++.1.dylib or @executable_path/../lib/libc++.1.dylib, whichever is the correct one.

Maybe it is copying the wrong one in here. I will test on Intel Mac when I have some time.

cp "/usr/local/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib"

@shinra-electric

Copy link
Copy Markdown
Contributor Author

The x86 build is now working.
Screenshot 2025-10-26 at 19 30 01

Ready for review

@shinra-electric
shinra-electric marked this pull request as ready for review October 26, 2025 10:31
@Megamouse
Megamouse merged commit 3a6c71e into RPCS3:master Oct 29, 2025
9 checks passed
@shinra-electric
shinra-electric deleted the mac-llvm-bump branch October 30, 2025 00:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Build and CI Anything related to the build process and continuous integration OS: macOS

Projects

None yet

3 participants