Skip to content

Use host triple in createIndexStoreAPI #2780

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jun 15, 2020

Conversation

MaxDesiatov
Copy link
Contributor

Currently, with the --enable-test-discovery flag SwiftPM looks for libIndexStore using the target triple if one was present, instead of the host triple. This breaks when cross-compiling, since you actually need libIndexStore from the host, not the target. This is resolved by adding a new hostTriple property, as opposed to the existing target triple property. New hostTriple is used in createIndexStoreAPI to infer the extension of libIndexStore when searching for it.

@neonichu
Copy link
Contributor

@swift-ci please smoke test

@MaxDesiatov
Copy link
Contributor Author

@neonichu I've pushed the fix for Linux tests, hostTriple can now be passed as an argument to the BuildParameters initializer, which is what BuildPlanTests do now for the mock toolchain.

@neonichu
Copy link
Contributor

@swift-ci please smoke test

@aciidgh aciidgh merged commit 7c5d422 into swiftlang:master Jun 15, 2020
@MaxDesiatov MaxDesiatov deleted the indexstore-host-triple branch October 14, 2020 20:42
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants