Skip to content

builder/unix: check out SDL release-2.32.8 to fix macOS builds on current Xcode CLT #605

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.

Sign up for GitHub

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

Open
bitcoin3us wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −1
Open

builder/unix: check out SDL release-2.32.8 to fix macOS builds on current Xcode CLT #605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion builder/unix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,15 @@ def submodules():
]
_run(cmd_)

cmd_ = ['cd lib/SDL && git checkout release-2.30.2']
# 2.32.8 is the SDL2 maintenance line with "Fixed building on macOS with
# OpenGL disabled" (libsdl-org/SDL 0b6eff41): 2.30.2 fails to compile
# against recent Xcode SDKs because SDL_cocoawindow.m messages the
# forward-declared SDLOpenGLContext when SDL_OPENGL is off, which newer
# clang treats as an error. Fetch first for clones that predate the tag.
cmd_ = [
'cd lib/SDL && git checkout release-2.32.8 2>/dev/null '
'|| (git fetch --tags && git checkout release-2.32.8)'
]
_run(cmd_)

return_code, _ = spawn(submodules_cmd)
Expand Down