Land #1081 - replace CMAKE_SYSTEM_PROCESSOR with HOST_*

1 files changed, 4 insertions, 5 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 342d4e8..048f6cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -384,16 +384,15 @@ endif()
 
 if(ENABLE_ASM)
         if(CMAKE_C_COMPILER_ABI STREQUAL "ELF")
-                if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|amd64)")
+                if(HOST_X86_64)
                         set(HOST_ASM_ELF_X86_64 true)
-                elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm" AND
-                       NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
+                elseif(HOST_ARM)
                         set(HOST_ASM_ELF_ARMV4 true)
-                elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
+                elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND HOST_I386)
                         set(HOST_ASM_ELF_X86_64 true)
                 endif()
                 add_definitions(-DHAVE_GNU_STACK)
-        elseif(APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+        elseif(APPLE AND HOST_X86_64)
                 set(HOST_ASM_MACOSX_X86_64 true)
         elseif(MSVC AND (CMAKE_GENERATOR MATCHES "Win64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "x64"))
                 set(HOST_ASM_MASM_X86_64 true)