Merge pull request #24625 from akien-mga/ios-sim-x86_64
SCons: Drop ios_sim option forcing x86, simulator needs x86_64
This commit is contained in:
commit
9c135ad263
|
@ -271,7 +271,7 @@ if env["platform"] == 'uwp':
|
||||||
else:
|
else:
|
||||||
import platform
|
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_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')
|
is_android_x86 = (env["platform"] == 'android' and env["android_arch"] == 'x86')
|
||||||
if is_android_x86:
|
if is_android_x86:
|
||||||
cpu_bits = '32'
|
cpu_bits = '32'
|
||||||
|
|
|
@ -29,7 +29,6 @@ def get_opts():
|
||||||
BoolVariable('icloud', 'Support for iCloud', True),
|
BoolVariable('icloud', 'Support for iCloud', True),
|
||||||
BoolVariable('ios_exceptions', 'Enable exceptions', False),
|
BoolVariable('ios_exceptions', 'Enable exceptions', False),
|
||||||
('ios_triple', 'Triple for ios toolchain', ''),
|
('ios_triple', 'Triple for ios toolchain', ''),
|
||||||
BoolVariable('ios_sim', 'Build simulator binary', False),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@ -64,10 +63,7 @@ def configure(env):
|
||||||
env.Append(LINKFLAGS=['-flto'])
|
env.Append(LINKFLAGS=['-flto'])
|
||||||
|
|
||||||
## Architecture
|
## Architecture
|
||||||
if env["ios_sim"] and not ("arch" in env):
|
if env["arch"] == "x86": # i386
|
||||||
env["arch"] = "x86"
|
|
||||||
|
|
||||||
if env["arch"] == "x86": # i386, simulator
|
|
||||||
env["bits"] = "32"
|
env["bits"] = "32"
|
||||||
elif env["arch"] == "x86_64":
|
elif env["arch"] == "x86_64":
|
||||||
env["bits"] = "64"
|
env["bits"] = "64"
|
||||||
|
|
Loading…
Reference in a new issue