Skip to content

Commit 3945816

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

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

Package.swift

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,14 @@ let javaIncludePath = "\(javaHome)/include"
8383
let javaPlatformIncludePath = "\(javaIncludePath)/win32"
8484
#endif
8585

86+
let subprocessSwiftSettings: [SwiftSetting] = [
87+
.define(
88+
"SYSTEM_PACKAGE_DARWIN",
89+
.when(platforms: [.macOS, .macCatalyst, .iOS, .watchOS, .tvOS, .visionOS])),
90+
.define("SYSTEM_PACKAGE"),
91+
.define("ENABLE_MOCKING", .when(configuration: .debug)),
92+
]
93+
8694
let package = Package(
8795
name: "SwiftJava",
8896
platforms: [
@@ -369,9 +377,9 @@ let package = Package(
369377
"JavaKitShared",
370378
"JavaKitConfigurationShared",
371379
// .product(name: "Subprocess", package: "swift-subprocess")
372-
"_Subprocess", // using process spawning
380+
"_Subprocess",
373381
],
374-
swiftSettings: [
382+
swiftSettings: subprocessSwiftSettings + [
375383
.swiftLanguageMode(.v5),
376384
.enableUpcomingFeature("BareSlashRegexLiterals"),
377385
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
@@ -394,8 +402,7 @@ let package = Package(
394402
"JavaKitShared",
395403
"JavaKitConfigurationShared",
396404
],
397-
398-
swiftSettings: [
405+
swiftSettings: subprocessSwiftSettings + [
399406
.swiftLanguageMode(.v5),
400407
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
401408
.enableUpcomingFeature("BareSlashRegexLiterals"),
@@ -497,13 +504,13 @@ let package = Package(
497504
// Experimental Foundation Subprocess Copy
498505
.target(
499506
name: "_SubprocessCShims",
500-
swiftSettings: [
507+
swiftSettings: subprocessSwiftSettings + [
501508
.swiftLanguageMode(.v5)
502509
]
503510
),
504511
.target(
505512
name: "_Subprocess",
506-
dependencies: [
513+
dependencies: subprocessSwiftSettings + [
507514
"_SubprocessCShims",
508515
.product(name: "SystemPackage", package: "swift-system"),
509516
],

0 commit comments

Comments
 (0)