[6.1] Add include dir from a clang module into the build args. (#8241)

- Description: Fix build error for `diagnose-api-breaking-changes`
command when C code is in non-standard location
 - Scope: Package
 - Risk: Low
- Testing: New test for this specific scenario. However, the test suite
is deactivated in 6.1 unless
[#8196](#8196) is
cherry-picked too.
 - Issue: #8073
- Cherry-picked from:
#8209
 - Author: @yyvch 
 - Reviewers: @plemarquand @jakepetroules

Author: yyvch

Fixtures/Miscellaneous/APIDiff/CIncludePath/Package.swift

@@ -0,0 +1,27 @@
+// swift-tools-version: 6.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Sample",
+    products: [
+        .library(
+            name: "Sample",
+            targets: ["Sample"]
+        ),
+    ],
+    targets: [
+        .target(
+            name: "CSample",
+            sources: ["./vendorsrc/src"],
+            cSettings: [
+                .headerSearchPath("./vendorsrc/include"),
+            ]
+        ),
+        .target(
+            name: "Sample",
+            dependencies: ["CSample"]
+        ),
+    ]
+)

Fixtures/Miscellaneous/APIDiff/CIncludePath/Sources/CSample/include/CSample.h

@@ -0,0 +1,3 @@
+
+#include "config.h"
+#include "../vendorsrc/include/vendor.h"

Fixtures/Miscellaneous/APIDiff/CIncludePath/Sources/CSample/include/config.h

@@ -0,0 +1 @@
+#define HAVE_VENDOR_CONFIG

Fixtures/Miscellaneous/APIDiff/CIncludePath/Sources/CSample/vendorsrc/include/vendor.h

@@ -0,0 +1,2 @@
+
+#include "config.h"

Fixtures/Miscellaneous/APIDiff/CIncludePath/Sources/CSample/vendorsrc/src/vendor.c

@@ -0,0 +1,6 @@
+#include "vendor.h"
+
+int vendor__func(int n)
+{
+  return 0;
+}

Fixtures/Miscellaneous/APIDiff/CIncludePath/Sources/Sample/Sample.swift

@@ -0,0 +1 @@
+import CSample

Sources/Build/BuildPlan/BuildPlan.swift

@@ -593,6 +593,7 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
                 if let includeDir = targetDescription.moduleMap?.parentDirectory {
                     arguments += ["-I", includeDir.pathString]
                 }
+                arguments += ["-I", targetDescription.clangTarget.includeDir.pathString]
             }
         }
 

Tests/CommandsTests/APIDiffTests.swift

@@ -273,6 +273,16 @@ final class APIDiffTests: CommandsTestCase {
         }
     }
 
+    func testAPIDiffOfVendoredCDependency() async throws {
+        try skipIfApiDigesterUnsupportedOrUnset()
+        try await fixture(name: "Miscellaneous/APIDiff/") { fixturePath in
+            let packageRoot = fixturePath.appending("CIncludePath")
+            let (output, _) = try await execute(["diagnose-api-breaking-changes", "main"], packagePath: packageRoot)
+
+            XCTAssertMatch(output, .contains("No breaking changes detected in Sample"))
+        }
+    }
+
     func testNoBreakingChanges() async throws {
         try skipIfApiDigesterUnsupportedOrUnset()
         try await fixture(name: "Miscellaneous/APIDiff/") { fixturePath in