Skip to content

Build: Fix container build path for swift #111299

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

Merged
merged 1 commit into from
Oct 18, 2025
Merged

Build: Fix container build path for swift #111299

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions platform/ios/detect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def get_opts():

return [
("vulkan_sdk_path", "Path to the Vulkan SDK", ""),
("SWIFT_FRONTEND", "Path to the swift-frontend binary", ""),
# APPLE_TOOLCHAIN_PATH Example: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain
(("APPLE_TOOLCHAIN_PATH", "IOS_TOOLCHAIN_PATH"), "Path to the Apple toolchain", ""),
(("APPLE_SDK_PATH", "IOS_SDK_PATH"), "Path to the iOS SDK", ""),
Expand Down
1 change: 1 addition & 0 deletions platform/macos/detect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def get_opts():

return [
("osxcross_sdk", "OSXCross SDK version", "darwin16"),
("SWIFT_FRONTEND", "Path to the swift-frontend binary", ""),
("MACOS_SDK_PATH", "Path to the macOS SDK", ""),
("vulkan_sdk_path", "Path to the Vulkan SDK", ""),
EnumVariable("macports_clang", "Build using Clang from MacPorts", "no", ["no", "5.0", "devel"], ignorecase=2),
Expand Down
1 change: 1 addition & 0 deletions platform/visionos/detect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def get_opts():
from SCons.Variables import BoolVariable

return [
("SWIFT_FRONTEND", "Path to the swift-frontend binary", ""),
# APPLE_TOOLCHAIN_PATH Example: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain
("APPLE_TOOLCHAIN_PATH", "Path to the Apple toolchain", ""),
(("APPLE_SDK_PATH", "VISIONOS_SDK_PATH"), "Path to the visionOS SDK", ""),
Expand Down
19 changes: 18 additions & 1 deletion platform_methods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,16 @@ def setup_swift_builder(env, apple_platform, sdk_path, current_path, bridging_he

env["ALL_SWIFT_FILES"] = all_swift_files
env["CURRENT_PATH"] = current_path
frontend_path = "$APPLE_TOOLCHAIN_PATH/usr/bin/swift-frontend"
if "SWIFT_FRONTEND" in env and env["SWIFT_FRONTEND"] != "":
frontend_path = env["SWIFT_FRONTEND"]
elif "osxcross" not in env:
frontend_path = "$APPLE_TOOLCHAIN_PATH/usr/bin/swift-frontend"
else:
frontend_path = None

if frontend_path is None:
raise Exception("Swift frontend path is not set. Please set SWIFT_FRONTEND.")

bridging_header_path = current_path + "/" + bridging_header_filename
env["SWIFTC"] = frontend_path + " -frontend -c" # Swift compiler
env["SWIFTCFLAGS"] = [
Expand All @@ -290,6 +299,14 @@ def setup_swift_builder(env, apple_platform, sdk_path, current_path, bridging_he
"-I./", # Pass the current directory as the header root so bridging headers can include files from any point of the hierarchy
]

if "osxcross" in env:
env.Append(
SWIFTCFLAGS=[
"-resource-dir",
"/root/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift",
]
)

if env["debug_symbols"]:
env.Append(SWIFTCFLAGS=["-g"])

Expand Down