Skip to content

Runtimes: properly link in swiftrtT?.obj on Windows #80101

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.

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
Mar 20, 2025

Conversation

compnerd
Copy link
Member

swiftrtT.obj should be used for statically linking the standard library (or within the standard library itself). For the other modules, we need to differentiate between swiftrt.obj and swiftrtT.obj. This fixes that oversight. This was not caught by the CI builds as we do not currently build both the static and dynamic variants of the new runtimes.

@compnerd
Copy link
Member Author

@swift-ci please smoke test

Copy link
Member

@etcwilde etcwilde left a comment

Choose a reason for hiding this comment

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

I sense that this line will continue to grow and be a source of bugs as we try to keep everything in sync. Can we instead create an interface library (maybe SwiftRuntimeRegistration) that forwards the link of the appropriate swiftrt?

Then replace these with

  ...
  swiftCore
  SwiftRuntimeRegistration
  ...

@compnerd
Copy link
Member Author

@swift-ci please smoke test

@compnerd
Copy link
Member Author

@swift-ci please smoke test

`swiftrtT.obj` should be used for statically linking the standard
library (or within the standard library itself). For the other modules,
we need to differentiate between `swiftrt.obj` and `swiftrtT.obj`. This
fixes that oversight. This was not caught by the CI builds as we do not
currently build both the static and dynamic variants of the new
runtimes.
@compnerd
Copy link
Member Author

@swift-ci please smoke test

@compnerd compnerd merged commit c1e8b97 into swiftlang:main Mar 20, 2025
3 checks passed
@compnerd compnerd deleted the stubs branch March 20, 2025 23:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants