Only pass a versioned prebuilt-modules for Mac Catalyst if it exists. #1695
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci please test |
artemcm
reviewed
Sep 16, 2024
|
For sure! Looks like I have a macOS-only test failure to fix anyways :) |
Some clients still have unversioned prebuilt modules, but SwiftDriver assumed that the versioned path would always exist for macOS (at least for the purposes of passing it when compiling for Mac Catalyst). This change duplicates some logic from the Swift frontend to check for the existence of the versioned macOS prebuilt modules directory before passing it, optionally stripping off trailing `.0` version components. This change also updates the driver so that it passes a prebuilt modules directory relative to the resource directory rather than relative to the compiler binary, also matching the Swift frontend's behavior. This addresses <rdar://problem/136047054>.
cwakamo
force-pushed
the
dev/check-for-existence-before-passing-Catalyst-prebuilt-modules
branch
from
2159196 to
b1573ef
Compare
|
@swift-ci please test |
|
@artemcm I pushed an update to the existing test, and made a slight change in behavior -- it now looks relative to the resource directory rather than relative to the Swift compiler executable, which IIRC matches the frontend's behavior. |
artemcm
approved these changes
Sep 16, 2024
|
@swift-ci please test Windows platform |
cwakamo
deleted the
dev/check-for-existence-before-passing-Catalyst-prebuilt-modules
branch
This was referenced Sep 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Some clients still have unversioned prebuilt modules, but SwiftDriver assumed that the versioned path would always exist for macOS (at least for the purposes of passing it when compiling for Mac Catalyst).
This change duplicates some logic from the Swift frontend to check for the existence of the versioned macOS prebuilt modules directory before passing it, optionally stripping off trailing
.0version components.This addresses rdar://problem/136047054.