Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

Commit 7a5ce33

Browse files
committed
Build ARM targets with Bitcode enabled (-fembed-bitcode) so that the
frameworks are suitable for projects with ENABLE_BITCODE = YES.
1 parent 1beb8ae commit 7a5ce33

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ IOS_SIMULATOR_64_CC=$(shell xcrun -find -sdk iphonesimulator clang) -arch x86_64
1919

2020
# iOS ARMV7 build commands and flags
2121
IOS_ARMV7_SDK_ROOT=$(shell xcrun --sdk iphoneos --show-sdk-path)
22-
IOS_ARMV7_CC=$(shell xcrun -find -sdk iphoneos clang) -arch armv7 --sysroot=$(IOS_ARMV7_SDK_ROOT) -miphoneos-version-min=7.0
22+
IOS_ARMV7_CC=$(shell xcrun -find -sdk iphoneos clang) -arch armv7 -fembed-bitcode --sysroot=$(IOS_ARMV7_SDK_ROOT) -miphoneos-version-min=7.0
2323

2424
# iOS ARMV7S build commands and flags
2525
IOS_ARMV7S_SDK_ROOT=$(shell xcrun --sdk iphoneos --show-sdk-path)
26-
IOS_ARMV7S_CC=$(shell xcrun -find -sdk iphoneos clang) -arch armv7s --sysroot=$(IOS_ARMV7S_SDK_ROOT) -miphoneos-version-min=7.0
26+
IOS_ARMV7S_CC=$(shell xcrun -find -sdk iphoneos clang) -arch armv7s -fembed-bitcode --sysroot=$(IOS_ARMV7S_SDK_ROOT) -miphoneos-version-min=7.0
2727

2828
# iOS ARM64 build commands and flags
2929
IOS_ARM64_SDK_ROOT=$(shell xcrun --sdk iphoneos --show-sdk-path)
30-
IOS_ARM64_CC=$(shell xcrun -find -sdk iphoneos clang) -arch arm64 --sysroot=$(IOS_ARM64_SDK_ROOT) -miphoneos-version-min=7.0
30+
IOS_ARM64_CC=$(shell xcrun -find -sdk iphoneos clang) -arch arm64 -fembed-bitcode --sysroot=$(IOS_ARM64_SDK_ROOT) -miphoneos-version-min=7.0
3131

3232

3333
all: Python-$(PYTHON_VERSION)-iOS-support.b$(BUILD_NUMBER).tar.gz

patch/Python/Python.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48913,17 +48913,17 @@ diff -Nru orig/iOS/Makefile modified/iOS/Makefile
4891348913
+
4891448914
+# iOS ARMV7 build commands and flags
4891548915
+IOS_ARMV7_SDK_ROOT=$(shell xcrun --sdk iphoneos --show-sdk-path)
48916-
+IOS_ARMV7_CC=$(shell xcrun -find -sdk iphoneos clang) -arch armv7 --sysroot=$(IOS_ARMV7_SDK_ROOT) -miphoneos-version-min=7.0
48916+
+IOS_ARMV7_CC=$(shell xcrun -find -sdk iphoneos clang) -arch armv7 -fembed-bitcode --sysroot=$(IOS_ARMV7_SDK_ROOT) -miphoneos-version-min=7.0
4891748917
+IOS_ARMV7_LD=$(shell xcrun -find -sdk iphoneos ld) -arch armv7 --sysroot=$(IOS_ARMV7_SDK_ROOT) -miphoneos-version-min=7.0
4891848918
+
4891948919
+# iOS ARMV7S build commands and flags
4892048920
+IOS_ARMV7S_SDK_ROOT=$(shell xcrun --sdk iphoneos --show-sdk-path)
48921-
+IOS_ARMV7S_CC=$(shell xcrun -find -sdk iphoneos clang) -arch armv7s --sysroot=$(IOS_ARMV7S_SDK_ROOT) -miphoneos-version-min=7.0
48921+
+IOS_ARMV7S_CC=$(shell xcrun -find -sdk iphoneos clang) -arch armv7s -fembed-bitcode --sysroot=$(IOS_ARMV7S_SDK_ROOT) -miphoneos-version-min=7.0
4892248922
+IOS_ARMV7S_LD=$(shell xcrun -find -sdk iphoneos ld) -arch armv7s --sysroot=$(IOS_ARMV7S_SDK_ROOT) -miphoneos-version-min=7.0
4892348923
+
4892448924
+# iOS ARM64 build commands and flags
4892548925
+IOS_ARM64_SDK_ROOT=$(shell xcrun --sdk iphoneos --show-sdk-path)
48926-
+IOS_ARM64_CC=$(shell xcrun -find -sdk iphoneos clang) -arch arm64 --sysroot=$(IOS_ARM64_SDK_ROOT) -miphoneos-version-min=7.0
48926+
+IOS_ARM64_CC=$(shell xcrun -find -sdk iphoneos clang) -arch arm64 -fembed-bitcode --sysroot=$(IOS_ARM64_SDK_ROOT) -miphoneos-version-min=7.0
4892748927
+IOS_ARM64_LD=$(shell xcrun -find -sdk iphoneos ld) -arch arm64 --sysroot=$(IOS_ARM64_SDK_ROOT) -miphoneos-version-min=7.0
4892848928
+
4892948929
+

0 commit comments

Comments
 (0)