[Macros on Darwin] Use device platform paths when building for the simulator #1400
Conversation
This file contains 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
…mulator To avoid having duplicated macro implementations in both the device and simulator platforms, when building for a simulator platform, pass `-external-plugin-path` that points into the *device* platform. There is no need to have macro implementations in the simulator platforms. Implements rdar://112563633
|
@swift-ci please test |
bnbarham
approved these changes
Jul 20, 2023
Comment on lines
-6886
to
+6892
| let pluginBIndex = job.commandLine.firstIndex(of: .path(VirtualPath.relative(.init("PluginB#Bexe")))) | ||
| let pluginBIndex = job.commandLine.firstIndex(of: .path(VirtualPath.relative(.init("Plugin~B#Bexe")))) |
There was a problem hiding this comment.
IIUC we're only shell escaping the SDK paths, not the ones that were already passed in. Could we just rename PlatformChecks to eg. Platform Checks?
There was a problem hiding this comment.
Sure, that's a good idea.
|
|
||
| func pluginPathTest(platform: String, searchPlatform: String) throws { | ||
| let sdkRoot = testInputsPath.appending( | ||
| components: ["PlatformChecks", "\(platform).platform", "Developer", "SDKs", "\(platform).sdk"]) |
There was a problem hiding this comment.
Doesn't the SDK name normally contain the version?
There was a problem hiding this comment.
It does. That shouldn't matter, but just in case... I'll update it.
There was a problem hiding this comment.
Agreed, there's no where that matters currently but... 🤷
... to make sure we're not missing any odd corner cases here.
|
@swift-ci please test |
|
@swift-ci please test Windows |
This pull request was closed.
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.
To avoid having duplicated macro implementations in both the device and
simulator platforms, when building for a simulator platform, pass
-external-plugin-paththat points into the device platform. Thereis no need to have macro implementations in the simulator platforms.
Implements rdar://112563633