Skip to content

Commit b755e1d

Browse files
authored
[PackageModel] Inject swift-testing flags only if toolchain is target… (#7920)
…ting macOS ### Motivation: 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. ### Modifications: - Replace `#if os(macOS)` with `if triple.isMacOSX` while deriving swift-testing flags for a toolchain. ### Result: Resolves: #7919 Resolves: rdar://134714404
1 parent 742157a commit b755e1d

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

Sources/PackageModel/UserToolchain.swift

+9-8
Original file line numberDiff line numberDiff line change
@@ -672,14 +672,15 @@ public final class UserToolchain: Toolchain {
672672
var swiftCompilerFlags: [String] = []
673673
var extraLinkerFlags: [String] = []
674674

675-
#if os(macOS)
676-
let (swiftCFlags, linkerFlags) = Self.deriveMacOSSpecificSwiftTestingFlags(
677-
derivedSwiftCompiler: swiftCompilers.compile,
678-
fileSystem: fileSystem
679-
)
680-
swiftCompilerFlags += swiftCFlags
681-
extraLinkerFlags += linkerFlags
682-
#endif
675+
if triple.isMacOSX {
676+
let (swiftCFlags, linkerFlags) = Self.deriveMacOSSpecificSwiftTestingFlags(
677+
derivedSwiftCompiler: swiftCompilers.compile,
678+
fileSystem: fileSystem
679+
)
680+
681+
swiftCompilerFlags += swiftCFlags
682+
extraLinkerFlags += linkerFlags
683+
}
683684

684685
swiftCompilerFlags += try Self.deriveSwiftCFlags(
685686
triple: triple,

0 commit comments

Comments
 (0)