From 95e96947f6c4e96d15b269db7a27a4a772d86b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 27 Dec 2018 13:42:15 +0100 Subject: [PATCH] SCons: Drop ios_sim option forcing x86, simulator needs x86_64 --- modules/webm/libvpx/SCsub | 2 +- platform/iphone/detect.py | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index 348de485be1..84e986630de 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -271,7 +271,7 @@ if env["platform"] == 'uwp': else: import platform is_x11_or_server_arm = ((env["platform"] == 'x11' or env["platform"] == 'server') and (platform.machine().startswith('arm') or platform.machine().startswith('aarch'))) - is_ios_x86 = (env["platform"] == 'iphone' and env["ios_sim"]) + is_ios_x86 = (env["platform"] == 'iphone' and ("arch" in env and env["arch"].startswith('x86'))) is_android_x86 = (env["platform"] == 'android' and env["android_arch"] == 'x86') if is_android_x86: cpu_bits = '32' diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index 4608770c09b..ee0e36b926a 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -29,7 +29,6 @@ def get_opts(): BoolVariable('icloud', 'Support for iCloud', True), BoolVariable('ios_exceptions', 'Enable exceptions', False), ('ios_triple', 'Triple for ios toolchain', ''), - BoolVariable('ios_sim', 'Build simulator binary', False), ] @@ -64,10 +63,7 @@ def configure(env): env.Append(LINKFLAGS=['-flto']) ## Architecture - if env["ios_sim"] and not ("arch" in env): - env["arch"] = "x86" - - if env["arch"] == "x86": # i386, simulator + if env["arch"] == "x86": # i386 env["bits"] = "32" elif env["arch"] == "x86_64": env["bits"] = "64"