Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS CI: Don't hardcode moltenVK and llvm version-specific paths #11427

Merged
merged 1 commit into from
Jan 27, 2022

Conversation

nastys
Copy link
Contributor

@nastys nastys commented Jan 22, 2022

This should prevent any future errors if the brew packages are updated.

@AniLeo AniLeo added the Build and CI Anything related to the build process and continuous integration label Jan 22, 2022
@nastys nastys marked this pull request as ready for review January 22, 2022 17:43
@makigumo
Copy link

makigumo commented Jan 23, 2022

As far as I can tell you can find the installed brew packages linked in /usr/local/opt/.
Maybe it's better to use those version agnostic paths instead. Something like this could suffice.

export VULKAN_SDK="/usr/local/opt/molten-vk/"
...
cp "/usr/local/opt/llvm/lib/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib"

PS: This is also what brew --cellar is returning

$ brew --cellar molten-vk
/usr/local/Cellar/molten-vk

so you could also write it like this:

export VULKAN_SDK="$(brew --cellar molten-vk)"
...
cp "$(brew --cellar llvm)/lib/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib"

@nastys
Copy link
Contributor Author

nastys commented Jan 23, 2022

As far as I can tell you can find the installed brew packages linked in /usr/local/opt/. Maybe it's better to use those version agnostic paths instead. Something like this could suffice.

export VULKAN_SDK="/usr/local/opt/molten-vk/"
...
cp "/usr/local/opt/llvm/lib/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib"

PS: This is also what brew --cellar is returning

$ brew --cellar molten-vk
/usr/local/Cellar/molten-vk

so you could also write it like this:

export VULKAN_SDK="$(brew --cellar molten-vk)"
...
cp "$(brew --cellar llvm)/lib/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib"

Thanks, I completely forgot about that.

Copy link
Member

@hcorion hcorion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Nekotekina Nekotekina merged commit bb65e67 into RPCS3:master Jan 27, 2022
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
Development

Successfully merging this pull request may close these issues.

6 participants