Browse Source

HADOOP-8764. CMake: HADOOP-8737 broke ARM build. Contributed by Trevor Robinson

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380984 13f79535-47bb-0310-9956-ffa450edef68
Eli Collins 12 years ago
parent
commit
6669feae07

+ 2 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -463,6 +463,8 @@ Branch-2 ( Unreleased changes )
     HADOOP-8722. Update BUILDING.txt with latest snappy info.
     HADOOP-8722. Update BUILDING.txt with latest snappy info.
     (Colin Patrick McCabe via eli)
     (Colin Patrick McCabe via eli)
 
 
+    HADOOP-8764. CMake: HADOOP-8737 broke ARM build. (Trevor Robinson via eli)
+
   BREAKDOWN OF HDFS-3042 SUBTASKS
   BREAKDOWN OF HDFS-3042 SUBTASKS
 
 
     HADOOP-8220. ZKFailoverController doesn't handle failure to become active
     HADOOP-8220. ZKFailoverController doesn't handle failure to become active

+ 2 - 0
hadoop-common-project/hadoop-common/src/JNIFlags.cmake

@@ -76,6 +76,8 @@ IF("${CMAKE_SYSTEM}" MATCHES "Linux")
         SET(_java_libarch "i386")
         SET(_java_libarch "i386")
     ELSEIF (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
     ELSEIF (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
         SET(_java_libarch "amd64")
         SET(_java_libarch "amd64")
+    ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+        SET(_java_libarch "arm")
     ELSE()
     ELSE()
         SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR})
         SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR})
     ENDIF()
     ENDIF()