Skip to content

[CMake] [Darwin] Don't build the SDK overlays by default on Apple platforms #75918

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

Conversation

ian-twilightcoder
Copy link
Contributor

@ian-twilightcoder ian-twilightcoder commented Aug 15, 2024

The Apple SDKs have been providing the Darwin overlay since macOS 10.14.4, iOS 12.2, et al. More recently the SDK version has diverged from the Swift version making them incompatible. Stop building the overlay from Swift. Once the SDK overlays aren't being built, the clang overlays need to be built in testing.

rdar://115192929

@ian-twilightcoder
Copy link
Contributor Author

This isn't enough to allow Swift to build against the current macOS 15.0 beta, but it's the upstream translation of what was done for rdar://115192929 and I think we'll need this all.

Copy link
Contributor

@al45tair al45tair left a comment

Choose a reason for hiding this comment

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

I wouldn't mix the attempt to disable the Darwin module with the lgamma_r fix. The latter we could merge pretty much straight away as a separate PR on its own. There are some additional issues with the former.

@ian-twilightcoder ian-twilightcoder force-pushed the new-apple-sdk-build-fixes branch from e6b4b4d to ecf318f Compare August 16, 2024 21:31
@ian-twilightcoder ian-twilightcoder changed the title [CMake] [Shims] [Darwin] Support building with and for the new Apple SDKs [CMake] [Darwin] Don't build the SDK overlays by default on Apple platforms Aug 16, 2024
@ian-twilightcoder
Copy link
Contributor Author

ian-twilightcoder commented Aug 16, 2024

Alright, trying again, stole a few changes from #75902 that it looks like I missed in the original change

@ian-twilightcoder ian-twilightcoder force-pushed the new-apple-sdk-build-fixes branch from ecf318f to 31cc144 Compare August 16, 2024 21:47
@ian-twilightcoder
Copy link
Contributor Author

I wouldn't mix the attempt to disable the Darwin module with the lgamma_r fix. The latter we could merge pretty much straight away as a separate PR on its own. There are some additional issues with the former.

It was easier to split the lgamma_r fix out and keep this for the Darwin module.

@ian-twilightcoder
Copy link
Contributor Author

Looks like we're going to need #75914 before we can do this one.

@ian-twilightcoder ian-twilightcoder force-pushed the new-apple-sdk-build-fixes branch from 31cc144 to dabd03b Compare August 20, 2024 21:57
@ian-twilightcoder ian-twilightcoder force-pushed the new-apple-sdk-build-fixes branch from dabd03b to caa0a3a Compare August 21, 2024 00:14
@ian-twilightcoder ian-twilightcoder marked this pull request as ready for review August 21, 2024 05:19
@ian-twilightcoder ian-twilightcoder requested review from a team and eeckstein as code owners August 21, 2024 05:19
@ian-twilightcoder ian-twilightcoder force-pushed the new-apple-sdk-build-fixes branch 3 times, most recently from 1163ac5 to 71686b6 Compare August 21, 2024 17:54
@ian-twilightcoder
Copy link
Contributor Author

This is stacked on top of #75914 and has to wait for that one (or whatever it gets split out to) before this can be rebased retested and merged.

@ian-twilightcoder ian-twilightcoder force-pushed the new-apple-sdk-build-fixes branch 2 times, most recently from fbc82aa to cde5927 Compare August 30, 2024 16:50
@ian-twilightcoder ian-twilightcoder force-pushed the new-apple-sdk-build-fixes branch 4 times, most recently from 4cb5bdd to e75a97c Compare September 4, 2024 23:23
…tforms

The Apple SDKs have been providing the Darwin overlay since macOS 10.14.4, iOS 12.2, et al. More recently the SDK version has diverged from the Swift version making them incompatible. Stop building the overlay from Swift. Once the SDK overlays aren't being built, the clang overlays need to be built in testing.

%target-swift-emit-pcm doesn't use the sdk, but %target-swift-frontend does, which will cause them to have a mismatch with "builtin headers belong to system modules, and _Builtin_ modules are ignored for cstdlib headers" aka LANGOPT(BuiltinHeadersInSystemModules) aka -fbuiltin-headers-in-system-modules.

rdar://115192929
@ian-twilightcoder ian-twilightcoder force-pushed the new-apple-sdk-build-fixes branch from e75a97c to 8959dd9 Compare September 6, 2024 20:28
@ian-twilightcoder
Copy link
Contributor Author

@swift-ci smoke test

@ian-twilightcoder ian-twilightcoder merged commit 080c20c into swiftlang:main Sep 7, 2024
3 checks passed
@ian-twilightcoder ian-twilightcoder deleted the new-apple-sdk-build-fixes branch September 9, 2024 23:21
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.

3 participants