Merge pull request swiftlang#33670 from artemcm/ClangScannerPathPrefixes

[Dependency Scanner] Prefix Clang dependency scanner search path arguments with `-Xcc`

Author: artemcm

lib/ClangImporter/ClangModuleDependencyScanner.cpp

@@ -260,12 +260,10 @@ void ClangImporter::recordModuleDependencies(
     // be found via search paths. Passing these headers as explicit inputs can
     // be quite challenging.
     for (auto &path: Impl.SwiftContext.SearchPathOpts.ImportSearchPaths) {
-      swiftArgs.push_back("-I");
-      swiftArgs.push_back(path);
+      addClangArg("-I" + path);
     }
     for (auto &path: Impl.SwiftContext.SearchPathOpts.FrameworkSearchPaths) {
-      swiftArgs.push_back(path.IsSystem ? "-Fsystem": "-F");
-      swiftArgs.push_back(path.Path);
+      addClangArg((path.IsSystem ? "-Fsystem": "-F") + path.Path);
     }
 
     // Swift frontend option for input file path (Foo.modulemap).

test/ScanDependencies/batch_module_scan.swift

@@ -28,7 +28,7 @@
 // CHECK-PCM-NEXT:    },
 // CHECK-PCM-NEXT:    {
 // CHECK-PCM-NEXT:      "modulePath": "F.pcm",
-// CHECK-PCM: "-I"
+// CHECK-PCM: "-I
 
 // CHECK-SWIFT: {
 // CHECK-SWIFT-NEXT:  "mainModuleName": "F",