Skip to content

Commit 312906a

Browse files
committed
fixing subprocess build on linux
1 parent 1224e41 commit 312906a

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

Package.swift

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ let package = Package(
369369
"JavaKitShared",
370370
"JavaKitConfigurationShared",
371371
// .product(name: "Subprocess", package: "swift-subprocess")
372-
"_Subprocess", // using process spawning
372+
"_Subprocess",
373373
],
374374
swiftSettings: [
375375
.swiftLanguageMode(.v5),
@@ -394,11 +394,14 @@ let package = Package(
394394
"JavaKitShared",
395395
"JavaKitConfigurationShared",
396396
],
397-
398397
swiftSettings: [
399398
.swiftLanguageMode(.v5),
400399
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
401400
.enableUpcomingFeature("BareSlashRegexLiterals"),
401+
.define(
402+
"SYSTEM_PACKAGE_DARWIN",
403+
.when(platforms: [.macOS, .macCatalyst, .iOS, .watchOS, .tvOS, .visionOS])),
404+
.define("SYSTEM_PACKAGE"),
402405
]
403406
),
404407

@@ -508,7 +511,11 @@ let package = Package(
508511
.product(name: "SystemPackage", package: "swift-system"),
509512
],
510513
swiftSettings: [
511-
.swiftLanguageMode(.v5)
514+
.swiftLanguageMode(.v5),
515+
.define(
516+
"SYSTEM_PACKAGE_DARWIN",
517+
.when(platforms: [.macOS, .macCatalyst, .iOS, .watchOS, .tvOS, .visionOS])),
518+
.define("SYSTEM_PACKAGE"),
512519
]
513520
),
514521
]

Sources/SwiftJavaTool/Commands/ResolveCommand.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ import SwiftJavaLib
2222
import JavaKitConfigurationShared
2323
import JavaKitShared
2424
import _Subprocess
25-
import System
25+
#if SYSTEM_PACKAGE
26+
@testable import SystemPackage
27+
#else
28+
@testable import System
29+
#endif
2630

2731
typealias Configuration = JavaKitConfigurationShared.Configuration
2832

0 commit comments

Comments
 (0)