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

Ensure that Godot's version of libc++_shared.so is always selected #92525

Merged
merged 1 commit into from
May 30, 2024

Conversation

m4gr3d
Copy link
Contributor

@m4gr3d m4gr3d commented May 29, 2024

This resolves collision issues in case dependencies have their own version.

@m4gr3d m4gr3d added this to the 4.3 milestone May 29, 2024
@m4gr3d m4gr3d requested a review from a team as a code owner May 29, 2024 21:44
Comment on lines +129 to +132
pickFirst 'lib/x86/libc++_shared.so'
pickFirst 'lib/x86_64/libc++_shared.so'
pickFirst 'lib/armeabi-v7a/libc++_shared.so'
pickFirst 'lib/arm64-v8a/libc++_shared.so'
Copy link
Member

Choose a reason for hiding this comment

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

I'm assuming there's gradle logic to still handle the arch properly only "pickFirst" the one that actually matches the target arch?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, this specifies a pattern and so it picks the ones that match the given patterns.

@akien-mga akien-mga changed the title Ensure that Godot's version of libc++_shared.so is always selected Ensure that Godot's version of libc++_shared.so is always selected May 30, 2024
@akien-mga akien-mga merged commit 80db5bd into godotengine:master May 30, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@m4gr3d m4gr3d deleted the fix_libcpp_selection branch May 30, 2024 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Not Critical
Development

Successfully merging this pull request may close these issues.

3 participants