Skip to content

[Build] Use SWIFT_SYSTEM_NAME rather than just lowercasing.#421

Merged
lorentey merged 1 commit intoapple:release/1.1from
al45tair:fix-static-linux-sdk-support
Sep 23, 2024
Merged

[Build] Use SWIFT_SYSTEM_NAME rather than just lowercasing.#421
lorentey merged 1 commit intoapple:release/1.1from
al45tair:fix-static-linux-sdk-support

Conversation

@al45tair
Copy link
Copy Markdown
Contributor

Lowercasing CMAKE_SYSTEM_NAME to find the name Swift uses for a platform is not guaranteed to work. Instead, use the SWIFT_SYSTEM_NAME variable, which lets us override the name when building the Static SDK for Linux.

Fixes #420.

@al45tair al45tair requested a review from lorentey as a code owner September 18, 2024 08:55
@al45tair
Copy link
Copy Markdown
Contributor Author

@swift-ci Please test

Copy link
Copy Markdown
Member

@lorentey lorentey left a comment

Choose a reason for hiding this comment

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

This looks good, thanks!

We need PR to land on the release/1.1 branch, not main. Can you please retarget it?

@lorentey lorentey added this to the 1.1.4 milestone Sep 20, 2024
@al45tair al45tair changed the base branch from main to release/1.1 September 23, 2024 10:13
@al45tair al45tair changed the base branch from release/1.1 to main September 23, 2024 10:13
Lowercasing `CMAKE_SYSTEM_NAME` to find the name Swift uses for a platform
is not guaranteed to work.  Instead, use the `SWIFT_SYSTEM_NAME` variable,
which lets us override the name when building the Static SDK for Linux.

Fixes apple#420.
@al45tair al45tair force-pushed the fix-static-linux-sdk-support branch from 8c0f4ba to fec5a5a Compare September 23, 2024 10:16
@al45tair al45tair changed the base branch from main to release/1.1 September 23, 2024 10:17
@al45tair
Copy link
Copy Markdown
Contributor Author

We need PR to land on the release/1.1 branch, not main. Can you please retarget it?

Done.

@al45tair
Copy link
Copy Markdown
Contributor Author

@swift-ci Please test

@al45tair
Copy link
Copy Markdown
Contributor Author

@swift-ci Please test macOS platform

@lorentey lorentey merged commit 44187cf into apple:release/1.1 Sep 23, 2024
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.

Missing required module '_FoundationCollections' when building with the Static Linux SDK

3 participants