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

Merge pull request #78303 from ian-twilightcoder/clang-importer-search-paths

Browse Source 
[ClangImporter] clang's -iframework comes before builtin usr/local/include, but Swift's -Fsystem comes after
This commit is contained in:
Ian Anderson
2025-01-06 13:05:25 -08:00
committed by GitHub
parent 9d43e7c429 cdb42c3535
commit 87d6979dae
30 changed files with 257 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/swift/Frontend/Frontend.h
View File

@@ -187,7 +187,8 @@ public:
return ClangImporterOpts.ClangScannerModuleCachePath;
}
void setImportSearchPaths(const std::vector<std::string> &Paths) {
void setImportSearchPaths(
const std::vector<SearchPathOptions::SearchPath> &Paths) {
SearchPathOpts.setImportSearchPaths(Paths);
}
@@ -196,16 +197,16 @@ public:
SearchPathOpts.DeserializedPathRecoverer = obfuscator;
}
ArrayRef<std::string> getImportSearchPaths() const {
ArrayRef<SearchPathOptions::SearchPath> getImportSearchPaths() const {
return SearchPathOpts.getImportSearchPaths();
}
void setFrameworkSearchPaths(
const std::vector<SearchPathOptions::FrameworkSearchPath> &Paths) {
const std::vector<SearchPathOptions::SearchPath> &Paths) {
SearchPathOpts.setFrameworkSearchPaths(Paths);
}
ArrayRef<SearchPathOptions::FrameworkSearchPath> getFrameworkSearchPaths() const {
ArrayRef<SearchPathOptions::SearchPath> getFrameworkSearchPaths() const {
return SearchPathOpts.getFrameworkSearchPaths();
}