Build: Fix container build path for swift #111299
Conversation
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
2 times, most recently
from
b28fdca to
558b0db
Compare
platform_methods.py
Outdated
| 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.
There was a problem hiding this comment.
I will fix that, as we should make it configurable.
There was a problem hiding this comment.
@akien-mga it's now configurable via SWIFT_FRONTEND, and I've tagged you in the changes to the godot-build-scripts repo with the additional change
stuartcarnie
force-pushed
the
swift_build
branch
from
558b0db to
ad74ed6
Compare
|
Thanks! |
5 participants
Summary
Ensures release builds using osxcross paths when using
swiftc.Depends on: