Add -F flag for xcframework dependency

Fixtures/Miscellaneous/Plugins/SymbolGraphForBinaryDependency/FooKit/Package.swift

@@ -0,0 +1,13 @@
+// swift-tools-version: 5.8
+
+import PackageDescription
+
+let package = Package(
+    name: "FooKit",
+    products: [
+        .library(name: "FooKit", type: .dynamic, targets: ["FooKit"]),
+    ],
+    targets: [
+        .target(name: "FooKit"),
+    ]
+)

Fixtures/Miscellaneous/Plugins/SymbolGraphForBinaryDependency/FooKit/Scripts/archive_xcframework.sh

@@ -0,0 +1,83 @@
+#!/bin/bash
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the Swift open source project
+##
+## Copyright (c) 2024 Apple Inc. and the Swift project authors
+## Licensed under Apache License v2.0 with Runtime Library Exception
+##
+## See http://swift.org/LICENSE.txt for license information
+## See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+##
+##===----------------------------------------------------------------------===##
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd -P)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+
+cd $PROJECT_ROOT
+
+PROJECT_BUILD_DIR="${PROJECT_BUILD_DIR:-"${PROJECT_ROOT}/.build"}"
+XCODEBUILD_BUILD_DIR="$PROJECT_BUILD_DIR/xcodebuild"
+XCODEBUILD_DERIVED_DATA_PATH="$XCODEBUILD_BUILD_DIR/DerivedData"
+
+PACKAGE_NAME=$1
+if [ -z "$PACKAGE_NAME" ]; then
+    echo "No package name provided. Using the first scheme found in the Package.swift."
+    PACKAGE_NAME=$(xcodebuild -list | awk 'schemes && NF>0 { print $1; exit } /Schemes:$/ { schemes = 1 }')
+    echo "Using: $PACKAGE_NAME"
+fi
+
+build_framework() {
+    local sdk="$1"
+    local destination="$2"
+    local scheme="$3"
+
+    local XCODEBUILD_ARCHIVE_PATH="$PROJECT_BUILD_DIR/$scheme-$sdk.xcarchive"
+
+    rm -rf "$XCODEBUILD_ARCHIVE_PATH"
+
+    PROTOBUFKIT_LIBRARY_TYPE=dynamic xcodebuild archive \
+        -scheme $scheme \
+        -archivePath $XCODEBUILD_ARCHIVE_PATH \
+        -derivedDataPath "$XCODEBUILD_DERIVED_DATA_PATH" \
+        -sdk "$sdk" \
+        -destination "$destination" \
+        BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
+        INSTALL_PATH='Library/Frameworks' \
+        OTHER_SWIFT_FLAGS=-no-verify-emitted-module-interface    
+
+    if [ "$sdk" = "macosx" ]; then
+        FRAMEWORK_MODULES_PATH="$XCODEBUILD_ARCHIVE_PATH/Products/Library/Frameworks/$scheme.framework/Versions/Current/Modules"
+        mkdir -p "$FRAMEWORK_MODULES_PATH"
+        cp -r \
+        "$XCODEBUILD_DERIVED_DATA_PATH/Build/Intermediates.noindex/ArchiveIntermediates/$scheme/BuildProductsPath/Release/$scheme.swiftmodule" \
+        "$FRAMEWORK_MODULES_PATH/$scheme.swiftmodule"
+        rm -rf "$XCODEBUILD_ARCHIVE_PATH/Products/Library/Frameworks/$scheme.framework/Modules"
+        ln -s Versions/Current/Modules "$XCODEBUILD_ARCHIVE_PATH/Products/Library/Frameworks/$scheme.framework/Modules"
+    else
+        FRAMEWORK_MODULES_PATH="$XCODEBUILD_ARCHIVE_PATH/Products/Library/Frameworks/$scheme.framework/Modules"
+        mkdir -p "$FRAMEWORK_MODULES_PATH"
+        cp -r \
+        "$XCODEBUILD_DERIVED_DATA_PATH/Build/Intermediates.noindex/ArchiveIntermediates/$scheme/BuildProductsPath/Release-$sdk/$scheme.swiftmodule" \
+        "$FRAMEWORK_MODULES_PATH/$scheme.swiftmodule"
+    fi
+
+    # Delete private and package swiftinterface
+    rm -f "$FRAMEWORK_MODULES_PATH/$scheme.swiftmodule/*.package.swiftinterface"
+    rm -f "$FRAMEWORK_MODULES_PATH/$scheme.swiftmodule/*.private.swiftinterface"
+}
+
+build_framework "macosx" "generic/platform=macOS" "$PACKAGE_NAME"
+
+echo "Builds completed successfully."
+
+cd $PROJECT_BUILD_DIR
+
+XCFRAMEWORK_DESTINATION="$PROJECT_ROOT/../$PACKAGE_NAME.xcframework"
+
+rm -rf $XCFRAMEWORK_DESTINATION
+xcodebuild -create-xcframework  \
+    -framework $PACKAGE_NAME-macosx.xcarchive/Products/Library/Frameworks/$PACKAGE_NAME.framework \
+    -output $XCFRAMEWORK_DESTINATION

Fixtures/Miscellaneous/Plugins/SymbolGraphForBinaryDependency/FooKit/Sources/FooKit/FooKit.swift

@@ -0,0 +1,4 @@
+/// print "foo"
+public func foo() {
+    print("foo")
+}

Fixtures/Miscellaneous/Plugins/SymbolGraphForBinaryDependency/Package.swift

@@ -0,0 +1,25 @@
+// swift-tools-version: 5.8
+import PackageDescription
+
+let package = Package(
+    name: "DemoKit",
+    products: [
+        .library(name: "DemoKit", targets: ["DemoKit"]),
+    ],
+    targets: [
+        .plugin(
+            name: "GenerateSymbolGraphPlugin",
+            capability: .command(
+                intent: .custom(
+                    verb: "generate-symbol-graph",
+                    description: "Generate symbol graph for all Swift source targets."
+                )
+            )
+        ),
+        .binaryTarget(name: "FooKit", path: "FooKit.xcframework"),
+        .target(
+            name: "DemoKit",
+            dependencies: ["FooKit"]
+        ),   
+    ]
+)

Fixtures/Miscellaneous/Plugins/SymbolGraphForBinaryDependency/Plugins/GenerateSymbolGraphPlugin/GenerateSymbolGraphPlugin.swift

@@ -0,0 +1,19 @@
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+import Foundation
+import PackagePlugin
+
+@main
+struct GenerateSymbolGraphPlugin: CommandPlugin {
+    func performCommand(context: PluginContext, arguments: [String]) throws {
+        for target in context.package.targets where target is SwiftSourceModuleTarget {
+            let _ = try packageManager.getSymbolGraph(for: target, options: .init())
+        }
+    }
+}

Fixtures/Miscellaneous/Plugins/SymbolGraphForBinaryDependency/Sources/DemoKit/DemoKit.swift

@@ -0,0 +1,6 @@
+import FooKit
+
+public func greeting(_ name: String) {
+    FooKit.foo()
+    print("Hello \(name)")
+}

Sources/Build/BuildDescription/SwiftModuleBuildDescription.swift

@@ -521,7 +521,10 @@ public final class SwiftModuleBuildDescription {
 
         // Only add the build path to the framework search path if there are binary frameworks to link against.
         if !self.libraryBinaryPaths.isEmpty {
-            args += ["-F", self.buildParameters.buildPath.pathString]
+            args += [
+                "-F", self.buildParameters.buildPath.pathString,
+                "-Xcc", "-F", "-Xcc", self.buildParameters.buildPath.pathString
+            ]
         }
 
         // Emit the ObjC compatibility header if enabled.
@@ -656,6 +659,14 @@ public final class SwiftModuleBuildDescription {
         // FIXME: only pass paths to the actual dependencies of the module
         // Include search paths for swift module dependencies.
         args += ["-I", self.modulesPath.pathString]
+
+        // Only add the build path to the framework search path if there are binary frameworks to link against.
+        if !self.libraryBinaryPaths.isEmpty {
+            args += [
+                "-F", self.buildParameters.buildPath.pathString,
+                "-Xcc", "-F", "-Xcc", self.buildParameters.buildPath.pathString
+            ]
+        }
 
         // FIXME: Only include valid args
         // This condition should instead only include args which are known to be

Sources/Build/BuildPlan/BuildPlan+Swift.swift

@@ -43,7 +43,7 @@ extension BuildPlan {
                     let libraries = try self.parseXCFramework(for: target, triple: swiftTarget.buildParameters.triple)
                     for library in libraries {
                         library.headersPaths.forEach {
-                            swiftTarget.additionalFlags += ["-I", $0.pathString, "-Xcc", "-I", "-Xcc", $0.pathString]
+                            swiftTarget.libraryBinaryPaths.insert($0)
                         }
                         swiftTarget.libraryBinaryPaths.insert(library.libraryPath)
                     }

Tests/BuildTests/PluginsBuildPlanTests.swift

@@ -79,4 +79,23 @@ final class PluginsBuildPlanTests: XCTestCase {
             )
         }
     }
+
+    func testDocCPluginForBinaryDependency() async throws {
+        #if !os(macOS)
+        // binaryTarget/xcframework is only supported on Darwin platform
+        throw XCTSkip("Test requires macOS")
+        #endif
+
+        try await fixture(name: "Miscellaneous/Plugins/SymbolGraphForBinaryDependency") { fixturePath in
+            let result = try await AsyncProcess.popen(arguments: [
+                fixturePath.appending(RelativePath("FooKit/Scripts/archive_xcframework.sh")).pathString,
+                "FooKit"
+            ])
+            try print(result.utf8Output())
+            try print(result.utf8stderrOutput())
+            XCTAssertEqual(result.exitStatus, .terminated(code: 0))
+            // Before we add -F support for xcframework, this call will throw since the command will abort with a non-zero exit code
+            let _ = try await executeSwiftPackage(fixturePath, extraArgs: ["generate-symbol-graph"])
+        }
+    }
 }