diff --git a/recipes/libffi/__init__.py b/recipes/libffi/__init__.py index 98c64e1..0147f75 100644 --- a/recipes/libffi/__init__.py +++ b/recipes/libffi/__init__.py @@ -11,7 +11,7 @@ class LibffiRecipe(Recipe): include_per_arch = True include_dir = "build_{arch.sdk}-{arch.arch}/include" include_name = "ffi" - archs = ["x86_64", "armv7", "arm64"] + archs = ["x86_64", "arm64"] def prebuild_arch(self, arch): if self.has_marker("patched"): diff --git a/toolchain.py b/toolchain.py index d8ca83a..13e3cde 100755 --- a/toolchain.py +++ b/toolchain.py @@ -223,36 +223,19 @@ class Arch(object): return env - -class ArchSimulator(Arch): - sdk = "iphonesimulator" - arch = "i386" - triple = "i386-apple-darwin11" - version_min = "-miphoneos-version-min=6.0.0" - sysroot = sh.xcrun("--sdk", "iphonesimulator", "--show-sdk-path").strip() - - class Arch64Simulator(Arch): sdk = "iphonesimulator" arch = "x86_64" triple = "x86_64-apple-darwin13" - version_min = "-miphoneos-version-min=7.0" + version_min = "-miphoneos-version-min=8.0" sysroot = sh.xcrun("--sdk", "iphonesimulator", "--show-sdk-path").strip() -class ArchIOS(Arch): - sdk = "iphoneos" - arch = "armv7" - triple = "arm-apple-darwin11" - version_min = "-miphoneos-version-min=6.0.0" - sysroot = sh.xcrun("--sdk", "iphoneos", "--show-sdk-path").strip() - - class Arch64IOS(Arch): sdk = "iphoneos" arch = "arm64" triple = "aarch64-apple-darwin13" - version_min = "-miphoneos-version-min=7.0" + version_min = "-miphoneos-version-min=8.0" sysroot = sh.xcrun("--sdk", "iphoneos", "--show-sdk-path").strip() @@ -355,9 +338,7 @@ class Context(object): self.install_dir = "{}/dist/root".format(self.root_dir) self.include_dir = "{}/dist/include".format(self.root_dir) self.archs = ( - # ArchSimulator(self), Arch64Simulator(self), - ArchIOS(self), Arch64IOS(self)) # path to some tools diff --git a/tools/biglink b/tools/biglink index 35405ac..3ec5859 100755 --- a/tools/biglink +++ b/tools/biglink @@ -20,5 +20,5 @@ for fn in sofiles: unique_args = ' '.join(x for x in sorted(set(args)) if x.endswith('.so.o')) print('Biglink create %s library' % sys.argv[1]) cmd = "ar -q %s %s" % (sys.argv[1], unique_args) -print(cmd) +print('Binlinking: {}'.format(cmd)) subprocess.Popen(cmd, shell=True).communicate() diff --git a/tools/liblink b/tools/liblink index 094cc20..8ce90e9 100755 --- a/tools/liblink +++ b/tools/liblink @@ -75,5 +75,11 @@ f.close() print('Liblink redirect linking with', objects) ld = environ.get('ARM_LD') -arch = environ.get('ARCH', 'armv7') -subprocess.call([ld, '-r', '-o', output + '.o', '-ios_version_min', '7.0', '-arch', arch] + objects) +arch = environ.get('ARCH', 'arm64') +if 'arm' in arch: + min_version_flag = '-ios_version_min' +else: + min_version_flag = '-ios_simulator_version_min' +call = [ld, '-r', '-o', output + '.o', min_version_flag, '8.0', '-arch', arch] + objects +print("Linking: {}".format(" ".join(call))) +subprocess.call(call)