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

DependencyScanner: add a new extraPcmArgs field for each Swift module

Browse Source 
Building each Swift module explicitly requires dependency PCMs to be built
with the exactly same deployment target version. This means we may need to
build a Clang module multiple times with different target triples.

This patch removes the -target arguments from the reported PCM build
arguments and inserts extraPcmArgs fields to each Swift module.
swift-driver can combine the generic PCM arguments with these extra arguments
to get the command suitable for building a PCM specifically for
that loading Swift module.
This commit is contained in:
Xi Ge
2020-06-10 16:12:01 -07:00
parent ecaf9afdb3
commit 00872ba53e
9 changed files with 77 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/swift/AST/ModuleLoader.h
View File

@@ -89,6 +89,7 @@ struct SubCompilerInstanceInfo {
CompilerInstance* Instance;
StringRef Hash;
ArrayRef<StringRef> BuildArguments;
ArrayRef<StringRef> ExtraPCMArgs;
};
/// Abstract interface to run an action in a sub ASTContext.
@@ -97,7 +98,8 @@ struct InterfaceSubContextDelegate {
StringRef interfacePath,
StringRef outputPath,
SourceLoc diagLoc,
llvm::function_ref<bool(ASTContext&,ArrayRef<StringRef>, StringRef)> action) = 0;
llvm::function_ref<bool(ASTContext&,ArrayRef<StringRef>,
ArrayRef<StringRef>, StringRef)> action) = 0;
virtual bool runInSubCompilerInstance(StringRef moduleName,
StringRef interfacePath,
StringRef outputPath,