diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6695313c18..e8f93272df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -337,7 +337,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch64|arm64|ARM64)")
 	set(HOST_AARCH64 true)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
 	set(HOST_ARM true)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i386")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
 	set(HOST_X86_64 true)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|amd64|AMD64)")
 	set(HOST_X86_64 true)
@@ -367,16 +367,16 @@ if(ENABLE_ASM)
 		elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm" AND
 		       NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
 			set(HOST_ASM_ELF_ARMV4 true)
-		elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i386")
+		elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
 			set(HOST_ASM_ELF_X86_64 true)
 		endif()
 		add_definitions(-DHAVE_GNU_STACK)
-	elseif(APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+	elseif(APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "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)
 		ENABLE_LANGUAGE(ASM_MASM)
-	elseif(MINGW AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+	elseif(MINGW AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
 		set(HOST_ASM_MINGW64_X86_64 true)
 	endif()
 endif()