Skip to content

[5.1] [ModuleInterface] Look for a prebuilt module by full target name #24412

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

Conversation

jrose-apple
Copy link
Contributor

@jrose-apple jrose-apple commented May 1, 2019

Cherry-pick of #24402 (reviewed by @harlanhaskins) and #24139 (by Harlan, reviewed by me and @nathawes) to the 5.1 branch. The latter's mostly to cherry-pick things more cleanly.

rdar://problem/50371801

Harlan Haskins and others added 2 commits May 1, 2019 13:49
…wiftlang#24139)

If we're loading a .swiftmodule from the resource dir adjacent to the compiler,
defer to the serialized loader instead of falling back. This is mainly to
support development of Swift, where one might change the module format version
but forget to recompile the standard library. If that happens, don't fall back
and silently recompile the standard library -- instead, error like we used to.

rdar://49926152
(cherry picked from commit 24c35f3)
…ftlang#24402)

Although the default cache location separates by platform, a
/combined/ cache is still an interesting idea, and in that case we
need to use the full platform names.

(cherry picked from commit 3d16557)
@jrose-apple
Copy link
Contributor Author

@swift-ci Please test

@jrose-apple jrose-apple merged commit 55d539f into swiftlang:swift-5.1-branch May 1, 2019
@jrose-apple jrose-apple deleted the 5.1-playing-the-long-game branch May 1, 2019 23:59
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.

1 participant