Skip to content

Commit 1226e49

Browse files
committed
Refer to Graal-generated dynamic libray as "internal"
1 parent c176cbd commit 1226e49

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

libpkl/libpkl.gradle.kts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ dependencies {
5656
}
5757

5858
executable {
59-
name = "libpkl"
59+
name = "libpkl-internal"
6060

6161
// TODO(kushal): Why is all of this necessary now? Can it be stripped back?
6262
javaName = "libpkl"
@@ -274,8 +274,7 @@ val assembleNativeWindowsAmd64 by tasks.existing { wraps(windowsNativeLibraryAmd
274274
val macNativeFullLibraryAarch64 by tasks.registering(Exec::class) {
275275
dependsOn(macNativeLibraryAarch64)
276276

277-
val sharedLibraryBuildDir = project.layout.buildDirectory.dir("libs/macos-aarch64").get()
278-
val libraryOutputDir = sharedLibraryBuildDir.dir("full")
277+
val libraryOutputDir = project.layout.buildDirectory.dir("libs/macos-aarch64").get()
279278
val projectDir = project.layout.projectDirectory.asFile.path
280279

281280
workingDir = libraryOutputDir.asFile
@@ -285,15 +284,15 @@ val macNativeFullLibraryAarch64 by tasks.registering(Exec::class) {
285284
"-o", "libpkl.dylib",
286285
"$projectDir/src/main/c/libpkl.c",
287286
"-I$projectDir/src/main/c",
288-
"-I$sharedLibraryBuildDir",
289-
"-L$sharedLibraryBuildDir",
290-
"-lpkl-macos-aarch64")
287+
"-I$libraryOutputDir",
288+
"-L$libraryOutputDir",
289+
"-lpkl-internal-macos-aarch64")
291290
}
292291

293292
val macNativeFullLibraryAarch64Copy by tasks.registering(Exec::class) {
294293
dependsOn(macNativeFullLibraryAarch64)
295294

296-
val libraryOutputDir = project.layout.buildDirectory.dir("libs/macos-aarch64/full").get()
295+
val libraryOutputDir = project.layout.buildDirectory.dir("libs/macos-aarch64").get()
297296
val projectDir = project.layout.projectDirectory.asFile.path
298297

299298
workingDir = libraryOutputDir.asFile

libpkl/src/main/c/libpkl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <pthread.h>
44

55
#include <graal_isolate.h>
6-
#include <libpkl-macos-aarch64.h>
6+
#include <libpkl-internal-macos-aarch64.h>
77

88
#include <libpkl.h>
99

0 commit comments

Comments
 (0)