27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
From 18ac6713e8657cca8fc791bcd581a47a7be6ebce Mon Sep 17 00:00:00 2001
|
|
From: Dinar Valeev <dvaleev@suse.com>
|
|
Date: Mon, 30 Jun 2014 18:29:20 +0200
|
|
Subject: [PATCH] FindJNI: search for ppc64 on ppc64le as well
|
|
|
|
IcedTea 2.5 have changed libarch for ppc64le to ppc64. Adjust FindJNI
|
|
to look for both for backward compatibility.
|
|
|
|
Signed-off-by: Dinar Valeev <dvaleev@suse.com>
|
|
---
|
|
Modules/FindJNI.cmake | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
|
|
index 6a496af..3dcb0d0 100644
|
|
--- a/Modules/FindJNI.cmake
|
|
+++ b/Modules/FindJNI.cmake
|
|
@@ -55,7 +55,7 @@ macro(java_append_library_directories _var)
|
|
# endianess of the underlying system.
|
|
set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
|
|
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
|
|
- set(_java_libarch "ppc64le")
|
|
+ set(_java_libarch "ppc64" "ppc64le")
|
|
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
|
|
set(_java_libarch "ppc64" "ppc")
|
|
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
|