Skip to content

Add new _foundation_unicode and _FoundationCShims c modules to windows build script #74796

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

Conversation

jmschonfeld
Copy link
Contributor

Now that Foundation is producing new C modules (_foundation_unicode and _FoundationCShims) that clients depend upon because we do not enable library evolution for our modules, we need to ensure these modules are correctly installed into the just built SDK like the existing dispatch C modules.

@jmschonfeld
Copy link
Contributor Author

@jmschonfeld
Copy link
Contributor Author

This corrected the issue in the windows toolchain build (the build above made it much farther than before)

@jmschonfeld jmschonfeld marked this pull request as ready for review June 27, 2024 22:54
@jmschonfeld
Copy link
Contributor Author

@swift-ci please smoke test

@compnerd
Copy link
Member

This also needs a change to the packaging manifest in https://github.com/apple/swift-installer-scripts.

@jmschonfeld
Copy link
Contributor Author

This also needs a change to the packaging manifest in https://github.com/apple/swift-installer-scripts.

Yep I'll post a change to that repo that also includes updates for all of the new libraries being added

@compnerd
Copy link
Member

Error: Error: swift.exe exited with code -1073741515.

-1073741515 = 0xc0000135, which I believe is DLL not found. I think that there are some path tweaks needed.

@jmschonfeld
Copy link
Contributor Author

Error: Error: swift.exe exited with code -1073741515.

-1073741515 = 0xc0000135, which I believe is DLL not found. I think that there are some path tweaks needed.

Thanks! That's super helpful, there's likely still an issue to resolve here but this PR at least gets us a lot closer. Previously the toolchain build failed while building TSC since it couldn't find these modules but now it makes it all the way to the swift-inspect build before failing. I'll investigate what might be missing, perhaps we're not copying one of the new Foundation dll's over properly

@jmschonfeld
Copy link
Contributor Author

@compnerd it looks like this change currently fails with the existing SCL-F because these _foundation_unicode / _FoundationCShims directories do not yet exist. Do you have a suggestion on how we could update the build script to only copy these if they exist so that we can stage this change in without requiring it to be landed in lockstep with the Foundation recore merge?

@compnerd
Copy link
Member

Hmm, you could check if the directory exists via the Test-Path command in powershell.

@jmschonfeld
Copy link
Contributor Author

@swift-ci please smoke test

@jmschonfeld
Copy link
Contributor Author

@swift-ci please smoke test

@jmschonfeld jmschonfeld requested a review from compnerd June 28, 2024 22:53
@jmschonfeld jmschonfeld merged commit 1f2ff67 into swiftlang:main Jul 1, 2024
3 checks passed
jmschonfeld added a commit to jmschonfeld/swift that referenced this pull request Jul 1, 2024
…s build script (swiftlang#74796)

* Add new _foundation_unicode and _FoundationCShims c modules to windows build script

* Only copy directories that exist

* Address feedback
jmschonfeld added a commit that referenced this pull request Jul 3, 2024
…s build script (#74796) (#74876)

* Add new _foundation_unicode and _FoundationCShims c modules to windows build script

* Only copy directories that exist

* Address feedback
@jmschonfeld jmschonfeld deleted the foundation-windows-copy-headers branch July 15, 2024 20:29
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