diff --git a/Crypto.mk b/Crypto.mk
index 41e709b..cb1fbaf 100644
--- a/Crypto.mk
+++ b/Crypto.mk
@@ -650,7 +650,7 @@
 include $(LOCAL_PATH)/android-config.mk
 LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
 LOCAL_SRC_FILES += $(local_src_files)
-ifeq ($(HOST_ARCH),x86)
+ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
   LOCAL_SRC_FILES += $(x86_src_files)
   LOCAL_SRC_FILES := $(filter-out $(x86_exclude_files),$(LOCAL_SRC_FILES))
   LOCAL_CFLAGS += $(x86_cflags)
@@ -673,7 +673,7 @@
 include $(LOCAL_PATH)/android-config.mk
 LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
 LOCAL_SRC_FILES += $(local_src_files)
-ifeq ($(HOST_ARCH),x86)
+ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
   LOCAL_SRC_FILES += $(x86_src_files)
   LOCAL_SRC_FILES := $(filter-out $(x86_exclude_files),$(LOCAL_SRC_FILES))
   LOCAL_CFLAGS += $(x86_cflags)