make: Fix support for arm64 JAVA_IDENTIFIER

google · Aug 8, 2022 · 98d49eb · 98d49eb
1 parent 4ba9f17
commit 98d49eb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk
@@ -64,10 +64,18 @@ ifeq ($(OS),Windows)
   JAVA_NATIVE_IDENTIFIER := win32-x86-64
 else
   ifeq ($(OS),Linux)
-    JAVA_NATIVE_IDENTIFIER := linux-x86-64
+    ifeq ($(CPU),aarch64)
+      JAVA_NATIVE_IDENTIFIER := linux-aarch64
+    else
+      JAVA_NATIVE_IDENTIFIER := linux-x86-64
+    endif
   else
     ifeq ($(OS),Darwin)
-    JAVA_NATIVE_IDENTIFIER := darwin-x86-64
+      ifeq ($(CPU),arm64)
+        JAVA_NATIVE_IDENTIFIER := darwin-aarch64
+      else
+        JAVA_NATIVE_IDENTIFIER := darwin-x86-64
+      endif
     else
     $(error OS unknown !)
     endif

diff --git a/makefiles/Makefile.port.mk b/makefiles/Makefile.port.mk
@@ -28,6 +28,7 @@ endif
 ifneq ($(PLATFORM),WIN64)
   OR_TOOLS_TOP ?= $(shell pwd)
   OS = $(shell uname -s)
+  CPU = $(shell uname -m)
   PYTHON_VERSION ?= $(shell python3 -c "from sys import version_info as v; print (str(v[0]) + '.' + str(v[1]))")
   CMAKE_PLATFORM = "Unix Makefiles"
 
@@ -322,6 +323,7 @@ detect_port:
 	@echo OR_TOOLS_TOP = $(OR_TOOLS_TOP)
 	@echo SHELL = $(SHELL)
 	@echo OS = $(OS)
+	@echo CPU = $(CPU)
 	@echo PLATFORM = $(PLATFORM)
 	@echo PORT = $(PORT)
 	@echo OR_TOOLS_MAJOR = $(OR_TOOLS_MAJOR)