Skip to content

Fix building glslang on platforms without <filesystem>#92819

Merged
akien-mga merged 1 commit intogodotengine:masterfrom
alula:patch-1
Jun 7, 2024
Merged

Fix building glslang on platforms without <filesystem>#92819
akien-mga merged 1 commit intogodotengine:masterfrom
alula:patch-1

Conversation

@alula
Copy link
Contributor

@alula alula commented Jun 5, 2024

Certain platforms using older libc++ versions have <filesystem> support disabled, which causes the builds after 7f1d3b1 to fail.

As there's already been a hack added for similar issue on macOS in upstream, this include is unused and can be removed.

@alula alula requested a review from a team as a code owner June 5, 2024 21:19
@akien-mga
Copy link
Member

Makes sense. Could you add that change in the patch file I added to document the changes we made to upstream glslang? This file will be used to reapply the changes next time we update, so if it's not updated we'll reintroduce this include by mistake.

https://github.com/godotengine/godot/blob/master/thirdparty/glslang/glslang/patches/disable-absolute-paths-for-apple-compat.patch

While at it, I notice I put in the wrong place (should be in thirdparty/glslang/patches, not thirdparty/glslang/glslang/patches. So you could move it one folder up.

I can also do it if you're not sure how to tweak the patch to add another section, let me know.

@akien-mga akien-mga added this to the 4.3 milestone Jun 5, 2024
@alula alula force-pushed the patch-1 branch 2 times, most recently from b3d7a9a to cde8a2b Compare June 5, 2024 23:53
@alula
Copy link
Contributor Author

alula commented Jun 5, 2024

done.

@akien-mga akien-mga changed the title Fix building glslang on platforms without <filesystem> Fix building glslang on platforms without <filesystem> Jun 7, 2024
@akien-mga akien-mga merged commit f9c5cdf into godotengine:master Jun 7, 2024
@akien-mga
Copy link
Member

Thanks!

@alula alula deleted the patch-1 branch June 9, 2024 04:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants