Merge pull request swiftlang#2917 from neonichu/use-cross-compile-flags-for-testing-as-well-2

[5.3] Fix cross-compile bootstrap

Author: shahmishal

Sources/XCBuildSupport/PIFBuilder.swift

@@ -20,13 +20,18 @@ import PackageGraph
 /// The parameters required by `PIFBuilder`.
 public struct PIFBuilderParameters {
 
+    /// Whether or not test discovery is enabled.
+    public let enableTestDiscovery: Bool
+
     /// Whether to create dylibs for dynamic library products.
     public let shouldCreateDylibForDynamicProducts: Bool
 
     /// Creates a `PIFBuilderParameters` instance.
     /// - Parameters:
+    ///   - enableTestDiscovery: Whether or not test discovery is enabled.
     ///   - shouldCreateDylibForDynamicProducts: Whether to create dylibs for dynamic library products.
-    public init(shouldCreateDylibForDynamicProducts: Bool) {
+    public init(enableTestDiscovery: Bool, shouldCreateDylibForDynamicProducts: Bool) {
+        self.enableTestDiscovery = enableTestDiscovery
         self.shouldCreateDylibForDynamicProducts = shouldCreateDylibForDynamicProducts
     }
 }
@@ -299,6 +304,11 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
         releaseSettings[.DEBUG_INFORMATION_FORMAT] = "dwarf-with-dsym"
         releaseSettings[.GCC_OPTIMIZATION_LEVEL] = "s"
         releaseSettings[.SWIFT_OPTIMIZATION_LEVEL] = "-Owholemodule"
+
+        if parameters.enableTestDiscovery {
+            releaseSettings[.ENABLE_TESTABILITY] = "YES"
+        }
+
         addBuildConfiguration(name: "Release", settings: releaseSettings)
 
         for product in package.products.sorted(by: { $0.name < $1.name }) {

Sources/XCBuildSupport/XcodeBuildSystem.swift

@@ -218,6 +218,7 @@ extension BuildConfiguration {
 extension PIFBuilderParameters {
     public init(_ buildParameters: BuildParameters) {
         self.init(
+            enableTestDiscovery: buildParameters.enableTestDiscovery,
             shouldCreateDylibForDynamicProducts: buildParameters.shouldCreateDylibForDynamicProducts
         )
     }

Tests/XCBuildSupportTests/PIFBuilderTests.swift

@@ -2159,6 +2159,7 @@ extension PIFBuilderParameters {
         shouldCreateDylibForDynamicProducts: Bool = false
     ) -> Self {
         PIFBuilderParameters(
+            enableTestDiscovery: false,
             shouldCreateDylibForDynamicProducts: shouldCreateDylibForDynamicProducts
         )
     }

Utilities/bootstrap

@@ -472,13 +472,6 @@ def build_swiftpm_with_swiftpm(args):
         "--disable-sandbox",
     ]
 
-    build_target = get_build_target(args)
-    cross_compile_hosts = args.cross_compile_hosts
-    if build_target == 'x86_64-apple-macosx' and "macosx-arm64" in cross_compile_hosts:
-        swiftpm_args += ["--arch", "x86_64", "--arch", "arm64"]
-    elif cross_compile_hosts:
-        error("cannot cross-compile for %s" % cross_compile_hosts)
-
     call_swiftpm(args, swiftpm_args)
 
     # Setup symlinks that'll allow using swiftpm from the build directory.
@@ -610,6 +603,13 @@ def get_swiftpm_flags(args):
     if 'ANDROID_DATA' in os.environ:
         build_flags.extend(["-Xswiftc", "-Xcc", "-Xswiftc", "-U_GNU_SOURCE"])
 
+    build_target = get_build_target(args)
+    cross_compile_hosts = args.cross_compile_hosts
+    if build_target == 'x86_64-apple-macosx' and "macosx-arm64" in cross_compile_hosts:
+        build_flags += ["--arch", "x86_64", "--arch", "arm64"]
+    elif cross_compile_hosts:
+        error("cannot cross-compile for %s" % cross_compile_hosts)
+
     return build_flags
 
 if __name__ == '__main__':