Address PR feedback

Author: MaxDesiatov

Sources/Build/BuildDescription/ProductBuildDescription.swift

@@ -148,7 +148,7 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
     }
 
     /// The arguments to link and create this product.
-    public func linkArguments(outputPathSuffix: String = "") throws -> [String] {
+    public func linkArguments() throws -> [String] {
         var args = [buildParameters.toolchain.swiftCompilerPath.pathString]
         args += self.buildParameters.sanitizers.linkSwiftFlags()
         args += self.additionalFlags
@@ -164,7 +164,7 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
         }
 
         args += ["-L", self.buildParameters.buildPath.pathString]
-        args += try ["-o", binaryPath.pathString + outputPathSuffix]
+        args += try ["-o", binaryPath.pathString]
         args += ["-module-name", self.product.name.spm_mangledToC99ExtendedIdentifier()]
         args += self.dylibs.map { "-l" + $0.product.name }
 

Sources/Build/BuildManifest/LLBuildManifestBuilder+Product.swift

@@ -37,13 +37,15 @@ extension LLBuildManifestBuilder {
         let targetName = try buildProduct.product.getLLBuildTargetName(config: self.buildConfig)
         let output: Node = .virtual(targetName)
 
+        let finalProductNode: Node
         switch buildProduct.product.type {
         case .library(.static):
+            finalProductNode = try .file(buildProduct.binaryPath)
             try self.manifest.addShellCmd(
                 name: cmdName,
                 description: "Archiving \(buildProduct.binaryPath.prettyPath())",
                 inputs: (buildProduct.objects + [buildProduct.linkFileListPath]).map(Node.file),
-                outputs: [.file(buildProduct.binaryPath)],
+                outputs: [finalProductNode],
                 arguments: try buildProduct.archiveArguments()
             )
 
@@ -54,22 +56,24 @@ extension LLBuildManifestBuilder {
                 + testInputs
 
             let shouldCodeSign: Bool
+            let linkedBinaryNode: Node
+            let linkedBinaryPath = try buildProduct.binaryPath
             if case .executable = buildProduct.product.type,
+               buildParameters.targetTriple.isMacOSX,
                buildParameters.debuggingParameters.shouldEnableDebuggingEntitlement {
                 shouldCodeSign = true
+                linkedBinaryNode = try .file(buildProduct.binaryPath, isMutated: true)
             } else {
                 shouldCodeSign = false
+                linkedBinaryNode = try .file(buildProduct.binaryPath)
             }
 
-            let linkedBinarySuffix = shouldCodeSign ? "-unsigned" : ""
-            let linkedBinaryPath = try AbsolutePath(validating: buildProduct.binaryPath.pathString + linkedBinarySuffix)
-
             try self.manifest.addShellCmd(
                 name: cmdName,
                 description: "Linking \(buildProduct.binaryPath.prettyPath())",
                 inputs: inputs.map(Node.file),
-                outputs: [.file(linkedBinaryPath)],
-                arguments: try buildProduct.linkArguments(outputPathSuffix: linkedBinarySuffix)
+                outputs: [linkedBinaryNode],
+                arguments: try buildProduct.linkArguments()
             )
 
             if shouldCodeSign {
@@ -86,25 +90,20 @@ extension LLBuildManifestBuilder {
                 try self.manifest.addShellCmd(
                     name: "\(cmdName)-entitlements",
                     description: "Applying debug entitlements to \(buildProduct.binaryPath.prettyPath())",
-                    inputs: [linkedBinaryPath, plistPath].map(Node.file),
+                    inputs: [linkedBinaryNode, .file(plistPath)],
                     outputs: [codeSigningOutput],
                     arguments: buildProduct.codeSigningArguments(plistPath: plistPath, binaryPath: linkedBinaryPath)
                 )
-
-                try self.manifest.addShellCmd(
-                    name: "\(cmdName)-codesigning",
-                    description: "Applying debug entitlements to \(buildProduct.binaryPath.prettyPath())",
-                    inputs: [codeSigningOutput],
-                    outputs: [.file(buildProduct.binaryPath)],
-                    arguments: ["mv", linkedBinaryPath.pathString, buildProduct.binaryPath.pathString]
-                )
+                finalProductNode = codeSigningOutput
+            } else {
+                finalProductNode = linkedBinaryNode
             }
         }
 
         self.manifest.addNode(output, toTarget: targetName)
-        try self.manifest.addPhonyCmd(
+        self.manifest.addPhonyCmd(
             name: output.name,
-            inputs: [.file(buildProduct.binaryPath)],
+            inputs: [finalProductNode],
             outputs: [output]
         )
 

Sources/CoreCommands/Options.swift

@@ -477,22 +477,11 @@ public struct BuildOptions: ParsableArguments {
     )
     public var linkTimeOptimizationMode: LinkTimeOptimizationMode?
 
-    /// Whether to enable debugging capabilities for code built by SwiftPM.
-    @Flag(
-        help: """
-        Whether to enable unsafe debugging and backtraces for code built by SwiftPM. \
-        Currently has an effect only on macOS.
-        """
-    )
-    public var enableUnsafeDebugging: Bool = false
+    @Flag(help: .hidden)
+    public var enableGetTaskAllowEntitlement: Bool = false
 
-    /// Whether to disable debugging capabilities for code built by SwiftPM.
-    @Flag(help: """
-        Whether to disable unsafe debugging and backtraces for code built by SwiftPM. \
-        Currently has an effect only on macOS.
-        """
-    )
-    public var disableUnsafeDebugging: Bool = false
+    @Flag(help: .hidden)
+    public var disableGetTaskAllowEntitlement: Bool = false
 
     // @Flag works best when there is a default value present
     // if true, false aren't enough and a third state is needed

Sources/CoreCommands/SwiftTool.swift

@@ -689,8 +689,8 @@ public final class SwiftTool {
                 debugInfoFormat: options.build.debugInfoFormat.buildParameter,
                 targetTriple: targetTriple,
                 shouldEnableDebuggingEntitlement:
-                    (options.build.configuration == .debug && !options.build.disableUnsafeDebugging) ||
-                    (options.build.enableUnsafeDebugging && !options.build.disableUnsafeDebugging)
+                    (options.build.configuration == .debug && !options.build.disableGetTaskAllowEntitlement) ||
+                    (options.build.enableGetTaskAllowEntitlement && !options.build.disableGetTaskAllowEntitlement)
             ),
             driverParameters: .init(
                 canRenameEntrypointFunctionName: driverSupport.checkSupportedFrontendFlags(