Merge pull request #67723 from compnerd/59-architectures-for-none

compnerd · web-flow · commit ae5efe8f43ca · 2023-08-09T09:46:22.000-07:00
ClangImporter: correct a duplicated path component
diff --git a/lib/ClangImporter/ClangIncludePaths.cpp b/lib/ClangImporter/ClangIncludePaths.cpp
@@ -38,7 +38,7 @@ static llvm::Optional<Path> getActualModuleMapPath(
   if (!SDKPath.empty()) {
     result.append(SDKPath.begin(), SDKPath.end());
     llvm::sys::path::append(result, "usr", "lib", "swift");
-    llvm::sys::path::append(result, platform, arch);
+    llvm::sys::path::append(result, platform);
     if (isArchSpecific) {
       llvm::sys::path::append(result, arch);
     }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ static llvm::Optional<Path> getActualModuleMapPath(`
`38`	`38`	`if (!SDKPath.empty()) {`
`39`	`39`	`result.append(SDKPath.begin(), SDKPath.end());`
`40`	`40`	`llvm::sys::path::append(result, "usr", "lib", "swift");`
`41`		`- llvm::sys::path::append(result, platform, arch);`
	`41`	`+ llvm::sys::path::append(result, platform);`
`42`	`42`	`if (isArchSpecific) {`
`43`	`43`	`llvm::sys::path::append(result, arch);`
`44`	`44`	`}`