From 29b84fecab292a6aef2c5c91d988f09a6e6852c0 Mon Sep 17 00:00:00 2001 From: Mike Ribbons Date: Tue, 18 Apr 2023 12:17:55 +1000 Subject: [PATCH 1/2] android: fix x86 not building due to i386 check --- src/common.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common.hh b/src/common.hh index d69237c5b9..5cf4d5fe55 100644 --- a/src/common.hh +++ b/src/common.hh @@ -255,7 +255,7 @@ namespace SSC { const String arch = "x86_64"; #elif defined(__aarch64__) || defined(_M_ARM64) const String arch = "arm64"; - #elif defined(__i386__) + #elif defined(__i386__) && !defined(__ANDROID__) #error SSC is not supported on i386. #else const String arch = "unknown"; From 864879738aacd77531c7b01c39f10667851d0ff6 Mon Sep 17 00:00:00 2001 From: Mike Ribbons Date: Wed, 19 Apr 2023 08:42:26 +1000 Subject: [PATCH 2/2] common.hh: i386 arch: change ssc to socket --- src/common.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common.hh b/src/common.hh index 5cf4d5fe55..87e00bbc14 100644 --- a/src/common.hh +++ b/src/common.hh @@ -256,7 +256,7 @@ namespace SSC { #elif defined(__aarch64__) || defined(_M_ARM64) const String arch = "arm64"; #elif defined(__i386__) && !defined(__ANDROID__) - #error SSC is not supported on i386. + #error Socket is not supported on i386. #else const String arch = "unknown"; #endif