Build: Fix container build path for swift #111299
Conversation
platform_methods.py
Outdated
| ] | ||
|
|
||
| if env["osxcross"]: | ||
| env.Append(SWIFTCFLAGS=["-resource-dir", "/root/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift"]) |
There was a problem hiding this comment.
| env.Append(SWIFTCFLAGS=["-resource-dir", "/root/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift"]) | |
| env.Append( | |
| SWIFTCFLAGS=[ | |
| "-resource-dir", | |
| "/root/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift", | |
| ] | |
| ) |
stuartcarnie
force-pushed
the
swift_build
branch
from
ca104e2 to
e866b19
Compare
|
Thanks, forgot about running |
stuartcarnie
force-pushed
the
swift_build
branch
from
b9bf467 to
035806e
Compare
stuartcarnie
force-pushed
the
swift_build
branch
from
035806e to
b28fdca
Compare
stuartcarnie
force-pushed
the
swift_build
branch
from
b28fdca to
558b0db
Compare
| if "osxcross" in env: | ||
| # TODO: swiftly use --print-location | ||
| frontend_path = "/root/.local/share/swiftly/toolchains/6.2.0/usr/bin/swift-frontend" |
There was a problem hiding this comment.
I'll note that this makes the setup hardcoded for our own osxcross setup in our build containers. In theory we used to support people using their own osxcross setup which may use different paths, which is why APPLE_TOOLCHAIN_PATH is configurable.
I think it becomes increasingly harder for users to get a working osxcross setup for cross-compilation without using our own build containers, so it's probably fine to hardcode things for now.
But we should soon see how to improve it further because e.g. the hardcoded 6.2.0 probably means that it won't be possible to compile iOS template for the current state of Godot after this PR in a year or two with an updated build container.
Summary
Ensures release builds using osxcross paths when using
swiftc.Depends on: