From 8821ee854bf71e707783c159185a4ec7a70d303d Mon Sep 17 00:00:00 2001
From: Boris Buegling <bbuegling@apple.com>
Date: Mon, 31 Oct 2022 10:51:35 -0700
Subject: [PATCH] Fix `disableSandboxForPluginCommands`

This was broken in #5846 which accidentally used the default value instead of passing along the global option.

rdar://101681661
---
 Sources/Build/BuildOperation.swift | 2 +-
 Sources/Commands/SwiftTool.swift   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Sources/Build/BuildOperation.swift b/Sources/Build/BuildOperation.swift
index a67cf26a99b..c266fa81eb0 100644
--- a/Sources/Build/BuildOperation.swift
+++ b/Sources/Build/BuildOperation.swift
@@ -102,7 +102,7 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
         additionalFileRules: [FileRuleDescription],
         pluginScriptRunner: PluginScriptRunner,
         pluginWorkDirectory: AbsolutePath,
-        disableSandboxForPluginCommands: Bool = false,
+        disableSandboxForPluginCommands: Bool,
         outputStream: OutputByteStream,
         logLevel: Basics.Diagnostic.Severity,
         fileSystem: TSCBasic.FileSystem,
diff --git a/Sources/Commands/SwiftTool.swift b/Sources/Commands/SwiftTool.swift
index 78e7b8cca57..e2c43ca9dbd 100644
--- a/Sources/Commands/SwiftTool.swift
+++ b/Sources/Commands/SwiftTool.swift
@@ -263,6 +263,7 @@ extension SwiftCommand {
                     additionalFileRules: FileRuleDescription.swiftpmFileTypes,
                     pluginScriptRunner: swiftTool.getPluginScriptRunner(),
                     pluginWorkDirectory: try swiftTool.getActiveWorkspace().location.pluginWorkingDirectory,
+                    disableSandboxForPluginCommands: swiftTool.options.security.shouldDisableSandbox,
                     outputStream: customOutputStream ?? swiftTool.outputStream,
                     logLevel: customLogLevel ?? swiftTool.logLevel,
                     fileSystem: swiftTool.fileSystem,