Skip to content

build: Install libraries in an arch sub-folder #5257

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

Jump to bottom
Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

build: Install libraries in an arch sub-folder #5257

wants to merge 2 commits into from
+45 −32

Conversation

Steelskin
Copy link
Contributor

@Steelskin Steelskin commented Aug 7, 2025 •
edited
Loading

This is the proper installation scheme for Swift libraries on Windows and prevents having to manually copy them in build.ps1.

@Steelskin
Copy link
Contributor Author

@swift-ci please test

@parkera parkera requested review from compnerd and jmschonfeld August 7, 2025 17:14
jmschonfeld
jmschonfeld reviewed Aug 7, 2025
View reviewed changes
@Steelskin Steelskin force-pushed the fabrice/build-install-swift-libraries-arch-folder branch from ef23f75 to ea40b13 Compare August 7, 2025 22:00
@Steelskin Steelskin marked this pull request as ready for review August 7, 2025 22:01
@Steelskin
Copy link
Contributor Author

@swift-ci please test

@Steelskin Steelskin requested a review from jmschonfeld August 11, 2025 16:34
@Steelskin Steelskin mentioned this pull request Aug 11, 2025
Draft
jmschonfeld
jmschonfeld reviewed Aug 11, 2025
View reviewed changes
Copy link
Contributor

@jmschonfeld jmschonfeld left a comment

Choose a reason for hiding this comment

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

I'm still not entirely sure I'm following what this change is intended to do - could you elaborate on the background/context a bit more? My current understanding is that when we ship the toolchain we ship a single swift module with multiple architectures within it. Do I have that right? And if so, is this intending to change how that is done but only on some platforms where SwiftFoundation_INSTALL_ARCH_SUBDIR is set?

@Steelskin
build: Install libraries in an arch sub-folder
e91ff61 
This is the proper installation scheme for Swift libraries and
prevents having to manually copy them in `build.ps1`.
@Steelskin
Install C and C++ libraries in the arch directory
81c5202 
* Update the C and C++ libraries to also install the arch
  sub-directory.
* Simplify the logic to gather the arch and triple data.
@Steelskin Steelskin force-pushed the fabrice/build-install-swift-libraries-arch-folder branch from ea40b13 to 81c5202 Compare August 29, 2025 22:26
@Steelskin
Copy link
Contributor Author

@jmschonfeld PTAL, my apologies it took me a while to get back to this.

I'm still not entirely sure I'm following what this change is intended to do - could you elaborate on the background/context a bit more? My current understanding is that when we ship the toolchain we ship a single swift module with multiple architectures within it. Do I have that right? And if so, is this intending to change how that is done but only on some platforms where SwiftFoundation_INSTALL_ARCH_SUBDIR is set?

The Windows toolchain layout expects that the native libraries are installed in an architecture sub-directory. There is a manual step in the build script for Windows to copy the libraries in the right folder that warns about these in this manner:

[2025-08-29T04:48:07.348Z] T:\Program Files\Swift\Platforms\Windows.platform\Developer\SDKs\WindowsExperimental.sdk\usr\lib\swift\windows\BlocksRuntime.lib is not nested in an architecture directory
[...]
[2025-08-29T04:48:07.348Z] T:\Program Files\Swift\Platforms\Windows.platform\Developer\SDKs\WindowsExperimental.sdk\usr\lib\swift_static\windows\_CFURLSessionInterface.lib is not nested in an architecture directory
[2025-08-29T04:48:07.348Z] T:\Program Files\Swift\Platforms\Windows.platform\Developer\SDKs\WindowsExperimental.sdk\usr\lib\swift_static\windows\_CFXMLInterface.lib is not nested in an architecture directory
[2025-08-29T04:48:07.348Z] T:\Program Files\Swift\Platforms\Windows.platform\Developer\SDKs\WindowsExperimental.sdk\usr\lib\swift_static\windows\_FoundationCShims.lib is not nested in an architecture directory
[...]

This PR aims to fix the problem by installing the libraries in the right directory with this new configuration option.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmschonfeld jmschonfeld jmschonfeld left review comments

@compnerd compnerd Awaiting requested review from compnerd

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Steelskin @jmschonfeld