From 25df0ecb0b044763edb015a6cbe556f6e064769c Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 7 Nov 2024 16:23:27 -0800 Subject: [PATCH 1/2] build: adjust the linker flags for JavaKit `-rpath` is not a universally valid flag for the linker. Adjust the linker flags to add the library search path on Windows and elide the `-rpath` flag. It is unclear why there is no `server` subdirectory under `lib` when using the Oracle JDK 23, but this allows us to find the necessary library. --- Package.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 0ea37b36..c944f41d 100644 --- a/Package.swift +++ b/Package.swift @@ -174,8 +174,10 @@ let package = Package( "-rpath", "-Xlinker", "\(javaHome)/lib/server", - ] + ], + .when(platforms: [.linux, .macOS]) ), + .unsafeFlags(["-L\(javaHome)/lib"], .when(platforms: [.windows])), .linkedLibrary("jvm"), ] ), From cc760e1db89be83ba5c5bc60fbcef691a72732e1 Mon Sep 17 00:00:00 2001 From: Konrad `ktoso` Malawski Date: Fri, 8 Nov 2024 16:43:57 +0900 Subject: [PATCH 2/2] Update Package.swift --- Package.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index c944f41d..44d59bf8 100644 --- a/Package.swift +++ b/Package.swift @@ -177,7 +177,11 @@ let package = Package( ], .when(platforms: [.linux, .macOS]) ), - .unsafeFlags(["-L\(javaHome)/lib"], .when(platforms: [.windows])), + .unsafeFlags( + [ + "-L\(javaHome)/lib" + ], + .when(platforms: [.windows])), .linkedLibrary("jvm"), ] ),