diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-27 17:26:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-27 17:26:51 +0100 |
| commit | 9c135ad2632b4cc754e0233c03b7a69dcfafe377 (patch) | |
| tree | b4a4310091d5962a43ab71428f26b0a8d523182d | |
| parent | daa50b28f2171a981eb49ed8032cd92dd998f8ca (diff) | |
| parent | 95e96947f6c4e96d15b269db7a27a4a772d86b09 (diff) | |
Merge pull request #24625 from akien-mga/ios-sim-x86_64
SCons: Drop ios_sim option forcing x86, simulator needs x86_64
| -rw-r--r-- | modules/webm/libvpx/SCsub | 2 | ||||
| -rw-r--r-- | 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 348de485be..84e986630d 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 4608770c09..ee0e36b926 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" |