averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[serialization] Framework modules live in Foo.framework/Modules/Foo.swiftmodule.

Browse Source 
...due to a code signing issue. See <rdar://problem/16328065> for details.

Also, fix an error where the wrong file name was being used for framework
docs.

No release note because no one is using Swift frameworks yet (besides LLDB).

Swift SVN r15074
This commit is contained in:
Jordan Rose
2014-03-14 20:51:19 +00:00
parent 8b82082920
commit 27d31c3672
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -91,24 +91,23 @@ findModule(ASTContext &ctx, AccessPathElem moduleID,
// FIXME: Which name should we be using here? Do we care about CPU subtypes?
// FIXME: At the very least, don't hardcode "arch".
llvm::SmallString<16> archFilename(ctx.LangOpts.TargetConfigOptions["arch"]);
llvm::SmallString<16> archDocFilename(ctx.LangOpts.TargetConfigOptions["arch"]);
if (!archFilename.empty()) {
archFilename += '.';
archFilename += SERIALIZED_MODULE_EXTENSION;
llvm::SmallString<16> archFile(ctx.LangOpts.TargetConfigOptions["arch"]);
llvm::SmallString<16> archDocFile(ctx.LangOpts.TargetConfigOptions["arch"]);
if (!archFile.empty()) {
archFile += '.';
archFile += SERIALIZED_MODULE_EXTENSION;
moduleDocFilename = ctx.LangOpts.TargetConfigOptions["arch"];
moduleDocFilename += '.';
moduleDocFilename += SERIALIZED_MODULE_DOC_EXTENSION;
archDocFile += '.';
archDocFile += SERIALIZED_MODULE_DOC_EXTENSION;
}
llvm::SmallString<128> currPath;
for (auto path : ctx.SearchPathOpts.FrameworkSearchPaths) {
currPath.clear();
llvm::sys::path::append(currPath, path, moduleFramework.str(),
moduleFilename.str());
auto err = openModuleFiles(currPath, archFilename.str(),
archDocFilename.str(), moduleBuffer,
"Modules", moduleFilename.str());
auto err = openModuleFiles(currPath, archFile.str(),
archDocFile.str(), moduleBuffer,
moduleDocBuffer, scratch);
if (!err || err.value() != llvm::errc::no_such_file_or_directory)
return err;