Commit adafc021 authored by Christian Stenger's avatar Christian Stenger
Browse files

Squish: Fix detection of ABIs on Mac



Change-Id: If3cca65f1f3ccf7e62dc79cde72d1bce41ab92b9
Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
parent 371ad563
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
<value type="QString">x86-linux-generic-elf-64bit</value> <value type="QString">x86-linux-generic-elf-64bit</value>
<value type="QString">x86-linux-generic-elf-32bit</value> <value type="QString">x86-linux-generic-elf-32bit</value>
<value type="QString">x86-macos-generic-mach_o-64bit</value>
</valuelist> </valuelist>
<value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
......
...@@ -147,6 +147,10 @@ def substituteDefaultCompiler(settingsDir): ...@@ -147,6 +147,10 @@ def substituteDefaultCompiler(settingsDir):
test.log("Injected default compiler '%s' to qtversion.xml..." % compiler) test.log("Injected default compiler '%s' to qtversion.xml..." % compiler)
def __guessABI__(supportedABIs, use64Bit): def __guessABI__(supportedABIs, use64Bit):
if platform.system() == 'Linux':
supportedABIs = filter(lambda x: 'linux' in x, supportedABIs)
elif platform.system() == 'Darwin':
supportedABIs = filter(lambda x: 'macos' in x, supportedABIs)
if use64Bit: if use64Bit:
searchFor = "64bit" searchFor = "64bit"
else: else:
...@@ -162,8 +166,6 @@ def __guessABI__(supportedABIs, use64Bit): ...@@ -162,8 +166,6 @@ def __guessABI__(supportedABIs, use64Bit):
return '' return ''
def __is64BitOS__(): def __is64BitOS__():
if platform.system() == 'Darwin':
return sys.maxsize > (2 ** 32)
if platform.system() in ('Microsoft', 'Windows'): if platform.system() in ('Microsoft', 'Windows'):
machine = os.getenv("PROCESSOR_ARCHITEW6432", os.getenv("PROCESSOR_ARCHITECTURE")) machine = os.getenv("PROCESSOR_ARCHITEW6432", os.getenv("PROCESSOR_ARCHITECTURE"))
else: else:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment