Skip to content

Add explicit device logic to the iOS build script #1889

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
a-maurice wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add explicit device logic to the iOS build script #1889

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
4 changes: 4 additions & 0 deletions scripts/gha/build_ios_tvos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,10 +483,14 @@ def cmake_configure(source_path, build_path, toolchain, archive_output_path,
cmd.append('-DCMAKE_SYSTEM_NAME=iOS')
if platform_variant == 'simulator':
cmd.append('-DCMAKE_OSX_SYSROOT=iphonesimulator')
elif platform_variant == 'device':
cmd.append('-DCMAKE_OSX_SYSROOT=iphoneos')
elif apple_os == 'tvos':
cmd.append('-DCMAKE_SYSTEM_NAME=tvOS')
if platform_variant == 'simulator':
cmd.append('-DCMAKE_OSX_SYSROOT=appletvsimulator')
elif platform_variant == 'device':
cmd.append('-DCMAKE_OSX_SYSROOT=appletvos')
Comment on lines 483 to +493

@gemini-code-assist gemini-code-assist Bot Jul 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

To improve readability and maintainability, we can simplify the nested conditional blocks by using a dictionary mapping for the platform variants to their respective SDK sysroots. This avoids repetitive if/elif checks and makes the configuration logic cleaner and more idiomatic.

Suggested change
cmd.append('-DCMAKE_SYSTEM_NAME=iOS')
if platform_variant == 'simulator':
cmd.append('-DCMAKE_OSX_SYSROOT=iphonesimulator')
elif platform_variant == 'device':
cmd.append('-DCMAKE_OSX_SYSROOT=iphoneos')
elif apple_os == 'tvos':
cmd.append('-DCMAKE_SYSTEM_NAME=tvOS')
if platform_variant == 'simulator':
cmd.append('-DCMAKE_OSX_SYSROOT=appletvsimulator')
elif platform_variant == 'device':
cmd.append('-DCMAKE_OSX_SYSROOT=appletvos')
cmd.append('-DCMAKE_SYSTEM_NAME=iOS')
sysroot = {'simulator': 'iphonesimulator', 'device': 'iphoneos'}.get(platform_variant)
if sysroot:
cmd.append('-DCMAKE_OSX_SYSROOT={0}'.format(sysroot))
elif apple_os == 'tvos':
cmd.append('-DCMAKE_SYSTEM_NAME=tvOS')
sysroot = {'simulator': 'appletvsimulator', 'device': 'appletvos'}.get(platform_variant)
if sysroot:
cmd.append('-DCMAKE_OSX_SYSROOT={0}'.format(sysroot))

cmd.append('-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY={0}'.format(archive_output_path))
cmd.append('-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={0}'.format(archive_output_path))
cmd.append('-DCMAKE_RUNTIME_OUTPUT_DIRECTORY={0}'.format(archive_output_path))
Expand Down
Loading