From aeaab7838285c6a7a7a853c0fa81ab6585b80d2c Mon Sep 17 00:00:00 2001
From: Pavel Yaskevich <xedin@apache.org>
Date: Mon, 26 Aug 2024 13:45:40 -0700
Subject: [PATCH] =?UTF-8?q?[6.0.0][PackageModel]=20Inject=20swift-testing?=
 =?UTF-8?q?=20flags=20only=20if=20toolchain=20is=20target=E2=80=A6=20(#792?=
 =?UTF-8?q?2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Explanation:

Fixes a bug where swift and linker flags for swift-testing were injected
into `extraFlags` of a toolchain that was targeting WASM but used macOS
to build.

- Main Branch PR:
https://github.com/swiftlang/swift-package-manager/pull/7920
- 6.0 Branch PR:
https://github.com/swiftlang/swift-package-manager/pull/7921

- Resolves:
https://github.com/swiftlang/swift-package-manager/issues/7919
- Resolves: rdar://134714404

- Risk: Low (only affects cross-compilation to WASM).

- Reviewed By: @bnbarham

- Testing: Manual testing since this is not currently possible to test
automatically.
---
 Sources/PackageModel/UserToolchain.swift | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Sources/PackageModel/UserToolchain.swift b/Sources/PackageModel/UserToolchain.swift
index 09c189660c6..0b9f39b2fd4 100644
--- a/Sources/PackageModel/UserToolchain.swift
+++ b/Sources/PackageModel/UserToolchain.swift
@@ -660,14 +660,15 @@ public final class UserToolchain: Toolchain {
         var swiftCompilerFlags: [String] = []
         var extraLinkerFlags: [String] = []
 
-        #if os(macOS)
-        let (swiftCFlags, linkerFlags) = Self.deriveMacOSSpecificSwiftTestingFlags(
-            derivedSwiftCompiler: swiftCompilers.compile,
-            fileSystem: fileSystem
-        )
-        swiftCompilerFlags += swiftCFlags
-        extraLinkerFlags += linkerFlags
-        #endif
+        if triple.isMacOSX {
+            let (swiftCFlags, linkerFlags) = Self.deriveMacOSSpecificSwiftTestingFlags(
+                derivedSwiftCompiler: swiftCompilers.compile,
+                fileSystem: fileSystem
+            )
+
+            swiftCompilerFlags += swiftCFlags
+            extraLinkerFlags += linkerFlags
+        }
 
         swiftCompilerFlags += try Self.deriveSwiftCFlags(
             triple: triple,