Skip to content

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

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
May 1, 2019

Conversation

jrose-apple
Copy link
Contributor

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

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.

rdar://problem/50371801

@jrose-apple
Copy link
Contributor Author

@swift-ci Please smoke test

@jrose-apple jrose-apple force-pushed the playing-the-long-game branch 2 times, most recently from 742928c to 87d8596 Compare May 1, 2019 16:39
@jrose-apple
Copy link
Contributor Author

@swift-ci Please smoke test

} else {
// Hack: deal with prebuilds of modules that still use the target-based
// names. This code is duplicated from above but there doesn't seem to
// be a great way to factor it out due to the early return.
Copy link
Contributor

@harlanhaskins harlanhaskins May 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would

if (!path)
  path = computeFallbackPrebuiltModulePath(scratch)

not work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it would. I wrote this against a version that didn't check fs::exists when computing the path, and then hastily revised it once I saw that that got in. I'll change it to that.

@jrose-apple jrose-apple force-pushed the playing-the-long-game branch from 87d8596 to 2818e36 Compare May 1, 2019 16:51
@jrose-apple
Copy link
Contributor Author

@swift-ci Please smoke test

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.
@jrose-apple jrose-apple force-pushed the playing-the-long-game branch from 2818e36 to b9d59bd Compare May 1, 2019 17:30
@jrose-apple
Copy link
Contributor Author

@swift-ci Please smoke test

@jrose-apple jrose-apple merged commit 3d16557 into swiftlang:master May 1, 2019
@jrose-apple jrose-apple deleted the playing-the-long-game branch May 1, 2019 20:48
jrose-apple added a commit to jrose-apple/swift that referenced this pull request May 1, 2019
…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 added a commit to jrose-apple/swift that referenced this pull request May 1, 2019
…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)
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.

2 participants