Skip to content

Use new way when building paths based on triple. #430

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

Merged
merged 1 commit into from
Oct 18, 2021

Conversation

3405691582
Copy link
Member

@3405691582 3405691582 commented Sep 28, 2021

In TSC swiftlang/swift-tools-support-core#229 and swiftlang/swift-package-manager#3576, we introduced a method named
platformBuildPathComponent to distinguish the valid platform path name
versus the valid target name, where one may have an embedded version
number and the other may not.

SourceKit test suite SwiftPMIntegrationTests currently fails. This is
presumably because this change may be required as it is one of two
uses of tripleString. The other uses tripleString as the value for
the -target field, so it is correct as written. The other -- as in
this commit -- builds a path.

This commit must be committed in concert with the aforementioned prs.

@ahoppen
Copy link
Member

ahoppen commented Sep 29, 2021

@swift-ci Please test

@ahoppen
Copy link
Member

ahoppen commented Sep 29, 2021

In TSC pr swiftlang#229 and SPM pr #3576, we introduced a method named
`platformBuildPathComponent` to distinguish the valid platform path name
versus the valid target name, where one may have an embedded version
number and the other may not.

SourceKit test suite SwiftPMIntegrationTests currently fails. This is
presumably because this change may be required as it is one of two
uses of `tripleString`. The other uses `tripleString` as the value for
the `-target` field, so it is correct as written. The other -- as in
this commit -- builds a path.

This commit must be committed in concert with the aforementioned prs.
@3405691582 3405691582 force-pushed the PlatformBuildPathComponent branch from 1682c76 to ee61890 Compare September 29, 2021 17:42
@3405691582
Copy link
Member Author

Added missing tripleString -> platformBuildPathComponent(), please retest.

@benlangmuir
Copy link
Contributor

@finagolfin
Copy link
Member

@benlangmuir, once you approve this, Boris says he will merge the three pulls.

@neonichu neonichu merged commit 8b71b01 into swiftlang:main Oct 18, 2021
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.

5 participants