Commit 411cf759 authored by Andoni Morales Alastruey's avatar Andoni Morales Alastruey
Browse files

ios: fix support for universal builds

parent ffb2b4d4
......@@ -241,7 +241,7 @@ class FilesProvider(object):
pattern += 'lib/%(f)s.dll.a '
pattern += 'lib/%(f)s.def '
pattern += 'lib/%(fnolib)s.lib '
elif self.platform == Platform.DARWIN:
elif self.platform in [Platform.DARWIN, Platform.IOS]:
pattern += 'lib/%(f)s.dylib '
libsmatch = [pattern % {'f':x, 'fnolib': x[3:]} for x in \
......
......@@ -131,6 +131,7 @@ class Config (object):
config._restore_environment()
if self.target_arch == Architecture.UNIVERSAL:
config.sources = os.path.join(self.sources, config.target_arch)
config.prefix = os.path.join(self.prefix)
config._load_platform_config()
config._load_last_defaults()
config._validate_properties()
......
......@@ -4,4 +4,3 @@ target_platform=Platform.IOS
target_arch=Architecture.ARMv7
target_distro=Distro.IOS
target_distro_version=DistroVersion.IOS_6_1
host='arm-apple-darwin'
......@@ -4,4 +4,3 @@ target_platform=Platform.IOS
target_arch=Architecture.X86
target_distro=Distro.IOS
target_distro_version=DistroVersion.IOS_6_1
host='i386-apple-darwin'
......@@ -34,11 +34,16 @@ ccache = use_ccache and 'ccache ' or ''
extra_cflags='-Wall -g -Os'
if target_arch == Architecture.ARMv7:
arch_cflags = ' -arch armv7 -mcpu=cortex-a8 -pipe'
host = 'arm-apple-darwin10'
elif target_arch == Architecture.ARM:
arch_cflags = ' -arch armv6 -mcpu=arm1176jzf-s -pipe'
host = 'arm-apple-darwin10'
elif target_arch == Architecture.X86:
arch_cflags = ' -arch i386 '
host = 'i386-apple-darwin10'
extra_cflags='-D__IPHONE_OS_VERSION_MIN_REQUIRED=%s0000' % min_version.replace('.', '')
elif target_arch == Architecture.UNIVERSAL:
arch_cflags=''
else:
raise FatalError("Arch not supported")
......
Supports Markdown
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