From 1aa11df725e1c88b8c2f18b711a63df73f6796a8 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 12 Aug 2020 19:28:12 -0700
Subject: [PATCH] Fix simulator build for Apple silicon

---
 libs/openssl/include/openssl/opensslconf.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libs/openssl/include/openssl/opensslconf.h b/libs/openssl/include/openssl/opensslconf.h
index 070657d..0be5e17 100644
--- a/libs/openssl/include/openssl/opensslconf.h
+++ b/libs/openssl/include/openssl/opensslconf.h
@@ -8,21 +8,21 @@
 
 #include <TargetConditionals.h>
 
-#if TARGET_OS_IOS && TARGET_OS_SIMULATOR && TARGET_CPU_X86
+#if TARGET_OS_IOS && TARGET_CPU_X86
 # include <openssl/opensslconf_ios_i386.h>
-#elif TARGET_OS_IOS && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64
+#elif TARGET_OS_IOS && TARGET_CPU_X86_64
 # include <openssl/opensslconf_ios_x86_64.h>
-#elif TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64
+#elif TARGET_OS_IOS && TARGET_CPU_ARM64
 # include <openssl/opensslconf_ios_arm64.h>
-#elif TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64E
+#elif TARGET_OS_IOS && TARGET_CPU_ARM64E
 # include <openssl/opensslconf_ios_arm64e.h>
-#elif TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM && defined(__ARM_ARCH_7S__)
+#elif TARGET_OS_IOS && TARGET_CPU_ARM && defined(__ARM_ARCH_7S__)
 # include <openssl/opensslconf_ios_armv7s.h>
-#elif TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM && !defined(__ARM_ARCH_7S__)
+#elif TARGET_OS_IOS && TARGET_CPU_ARM && !defined(__ARM_ARCH_7S__)
 # include <openssl/opensslconf_ios_armv7.h>
-#elif TARGET_OS_TV && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64
+#elif TARGET_OS_TV && TARGET_CPU_X86_64
 # include <openssl/opensslconf_tvos_x86_64.h>
-#elif TARGET_OS_TV && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64
+#elif TARGET_OS_TV && TARGET_CPU_ARM64
 # include <openssl/opensslconf_tvos_arm64.h>
 #else
 # error Unable to determine target or target not included in OpenSSL build