Skip to content

Commit 4187453

Browse files
committed
Make AddFrameworkInclude take same args as AddSearchPath
1 parent 7cd2067 commit 4187453

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

clang/lib/Driver/ToolChains/Darwin.cpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -2560,16 +2560,15 @@ void DarwinClang::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs
25602560
}
25612561

25622562
// Add default framework search paths
2563-
auto addFrameworkInclude = [&](auto ...Path) {
2563+
auto AddFrameworkInclude = [&](StringRef Flag, StringRef SearchPath) {
25642564
SmallString<128> P(Sysroot);
2565-
llvm::sys::path::append(P, Path...);
2566-
2567-
CC1Args.push_back("-internal-iframework");
2565+
llvm::sys::path::append(P, SearchPath);
2566+
CC1Args.push_back(DriverArgs.MakeArgString(Flag));
25682567
CC1Args.push_back(DriverArgs.MakeArgString(P));
25692568
};
2570-
addFrameworkInclude("System", "Library", "Frameworks");
2571-
addFrameworkInclude("System", "Library", "SubFrameworks");
2572-
addFrameworkInclude("Library", "Frameworks");
2569+
AddFrameworkInclude("-internal-iframework", "/System/Library/Frameworks");
2570+
AddFrameworkInclude("-internal-iframework", "/System/Library/SubFrameworks");
2571+
AddFrameworkInclude("-internal-iframework", "/Library/Frameworks");
25732572
}
25742573

25752574
bool DarwinClang::AddGnuCPlusPlusIncludePaths(const llvm::opt::ArgList &DriverArgs,

0 commit comments

Comments
 (0)