From add12356f67b02d74fe4892896831074c0d2acad Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 17 May 2019 16:12:44 +0200
Subject: [PATCH] Fix path for native lib in jar under SunOS.

CMAKE_SYSTEM_PROCESSOR is i386, even in 64bit mode.
---
 tools/cmake/Java.cmake | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index f9cee4947e..c462643d1b 100644
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -103,12 +103,14 @@ if(enable_lib_in_jar)
   endif()
 
   set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
-  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$")
-    set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/x86)
-  endif()
-  if(  (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR
-       (${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")     )
-    set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/amd64)
+  if( (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$") OR
+      (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR
+      (${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64") )
+    if(CMAKE_SIZEOF_VOID_P EQUAL 4) # 32 bits
+      set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/x86)
+    else()
+      set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/amd64)
+    endif()
   endif()
   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
     set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/arm) # Default arm (soft-float ABI)
-- 
2.20.1