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

[Caching] Switch clang-include-tree to be default for clang modules

Browse Source 
Switch to use clang-include-tree by default for clang module
building/caching when using a CAS. This is the default mode for clang
module and has less issues than CAS file system based implementation.
This commit is contained in:
Steven Wu
2023-11-06 14:53:24 -08:00
parent a09052f2a7
commit 109566fb81
9 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ClangImporter/ClangModuleDependencyScanner.cpp
View File

@@ -259,12 +259,12 @@ ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(
}
if (!RootID.empty()) {
swiftArgs.push_back("-no-clang-include-tree");
swiftArgs.push_back("-cas-fs");
swiftArgs.push_back(RootID);
}
if (!IncludeTree.empty()) {
swiftArgs.push_back("-clang-include-tree");
swiftArgs.push_back("-clang-include-tree-root");
swiftArgs.push_back(IncludeTree);
}
@@ -368,11 +368,11 @@ void ClangImporter::recordBridgingHeaderOptions(
}
if (auto Tree = deps.IncludeTreeID) {
swiftArgs.push_back("-clang-include-tree");
swiftArgs.push_back("-clang-include-tree-root");
swiftArgs.push_back(*Tree);
}
if (auto CASFS = deps.CASFileSystemRootID) {
swiftArgs.push_back("-no-clang-include-tree");
swiftArgs.push_back("-cas-fs");
swiftArgs.push_back(*CASFS);
}