From 4c5f88d8282f9bccad8435b274297216f4b72b44 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Mon, 19 Dec 2022 09:41:02 -0600 Subject: [PATCH 1/2] Add support for Unix ARM builds --- bindings/java/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bindings/java/Makefile b/bindings/java/Makefile index 9e891bb..9b8ea01 100644 --- a/bindings/java/Makefile +++ b/bindings/java/Makefile @@ -15,10 +15,11 @@ ifeq ($(OS),Windows_NT) else CLANG_EXECUTABLE=clang UNAME_S := $(shell uname -s) + UNAME_M := $(shell uname -m) ifeq ($(UNAME_S),Linux) CLANG_FLAGS=-fPIC -shared JNI_INCLUDE_FOLDER=linux - OS_ARCH=amd64 + OS_ARCH=$(UNAME_M) LIBRARY_RESOURCE=libckzg4844jni.so endif ifeq ($(UNAME_S),Darwin) @@ -27,7 +28,11 @@ else endif CLANG_FLAGS=-dynamiclib JNI_INCLUDE_FOLDER=darwin - OS_ARCH=x86_64 + ifeq ($(UNAME_M),arm64) + OS_ARCH=aarch64 + else + OS_ARCH=$(UNAME_M) + endif LIBRARY_RESOURCE=libckzg4844jni.dylib endif GRADLE_COMMAND=./gradlew From 3a62ca018e852b70f745367710044e676ff5d700 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Mon, 19 Dec 2022 09:52:54 -0600 Subject: [PATCH 2/2] Convert Linux x86_64 to amd64 --- bindings/java/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bindings/java/Makefile b/bindings/java/Makefile index 9b8ea01..815866d 100644 --- a/bindings/java/Makefile +++ b/bindings/java/Makefile @@ -19,7 +19,11 @@ else ifeq ($(UNAME_S),Linux) CLANG_FLAGS=-fPIC -shared JNI_INCLUDE_FOLDER=linux - OS_ARCH=$(UNAME_M) + ifeq ($(UNAME_M),x86_64) + OS_ARCH=amd64 + else + OS_ARCH=$(UNAME_M) + endif LIBRARY_RESOURCE=libckzg4844jni.so endif ifeq ($(UNAME_S),Darwin)