From 0caab36c0baf64216c6f4f629ba18f43bc872a45 Mon Sep 17 00:00:00 2001 From: Enrico Del Fante Date: Fri, 25 Nov 2022 10:31:23 +0100 Subject: [PATCH] Java binding compilation improvement for macos Tries to get `JAVA_HOME` automatically if not already set --- bindings/java/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bindings/java/Makefile b/bindings/java/Makefile index f11a6da..c92a253 100644 --- a/bindings/java/Makefile +++ b/bindings/java/Makefile @@ -8,15 +8,18 @@ ifeq ($(OS),Windows_NT) LIBRARY_RESOURCE=ckzg4844jni.dll else CLANG_EXECUTABLE=clang - GRADLE_COMMAND=./gradlew + GRADLE_COMMAND=./gradlew UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Linux) - CLANG_FLAGS=-fPIC -shared + CLANG_FLAGS=-fPIC -shared JNI_INCLUDE_FOLDER=linux LIBRARY_RESOURCE=libckzg4844jni.so endif ifeq ($(UNAME_S),Darwin) - CLANG_FLAGS=-dynamiclib + ifeq ($(JAVA_HOME),) + JAVA_HOME := $(shell /usr/libexec/java_home) + endif + CLANG_FLAGS=-dynamiclib JNI_INCLUDE_FOLDER=darwin LIBRARY_RESOURCE=libckzg4844jni.dylib endif