Disable zippered catalyst builds again #62882
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch does two things. One, zippers the Onone support library that I missed in the first pass.
Two, disables the catalyst build again. The open-source SwiftC appears to be missing something for catalyst, which would result in a miscompile situration.
The failing test:
SILGen/availability_query_maccatalyst_zippered_canonical_versions.swift
The expectation is that we check for both macOS and iOS version numbers in a catalyst build;
Currently, the OSS Swiftc is only emitting checks for macOS. I don't have time at the moment to dig further than that.
The build system should be in a place to handle catalyst builds, but it looks like the compiler is not.