Skip to content

Commit

Permalink
Remove bitcode support, as is now deprecated by Apple (#894)
Browse files Browse the repository at this point in the history
  • Loading branch information
misl6 authored Feb 14, 2024
1 parent 7a03217 commit 3d94a16
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 12 deletions.
1 change: 0 additions & 1 deletion kivy_ios/recipes/libffi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ def build_platform(self, plat):
shprint(sh.xcodebuild, self.ctx.concurrent_xcodebuild,
"ONLY_ACTIVE_ARCH=NO",
"ARCHS={}".format(plat.arch),
"BITCODE_GENERATION_MODE=bitcode",
"-sdk", plat.sdk,
"-project", "libffi.xcodeproj",
"-target", "libffi-iOS",
Expand Down
2 changes: 1 addition & 1 deletion kivy_ios/recipes/python3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def build_platform(self, plat):
shprint(configure,
"CC={}".format(build_env["CC"]),
"LD={}".format(build_env["LD"]),
"CFLAGS={}".format(build_env["CFLAGS"].replace("-fembed-bitcode", "")),
"CFLAGS={}".format(build_env["CFLAGS"]),
"LDFLAGS={} -undefined dynamic_lookup".format(build_env["LDFLAGS"]),
"ac_cv_file__dev_ptmx=yes",
"ac_cv_file__dev_ptc=no",
Expand Down
1 change: 0 additions & 1 deletion kivy_ios/recipes/sdl2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ def build_platform(self, plat):
shprint(sh.xcodebuild, self.ctx.concurrent_xcodebuild,
"ONLY_ACTIVE_ARCH=NO",
"ARCHS={}".format(plat.arch),
"BITCODE_GENERATION_MODE=bitcode",
"CC={}".format(env['CC']),
"-sdk", plat.sdk,
"-project", "Xcode/SDL/SDL.xcodeproj",
Expand Down
1 change: 0 additions & 1 deletion kivy_ios/recipes/sdl2_image/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ def build_platform(self, plat):
shprint(sh.xcodebuild, self.ctx.concurrent_xcodebuild,
"ONLY_ACTIVE_ARCH=NO",
"ARCHS={}".format(plat.arch),
"BITCODE_GENERATION_MODE=bitcode",
"HEADER_SEARCH_PATHS={}".format(
join(self.ctx.include_dir, "common", "sdl2")),
"-sdk", plat.sdk,
Expand Down
1 change: 0 additions & 1 deletion kivy_ios/recipes/sdl2_mixer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ def build_platform(self, plat):
shprint(sh.xcodebuild, self.ctx.concurrent_xcodebuild,
"ONLY_ACTIVE_ARCH=NO",
"ARCHS={}".format(plat.arch),
"BITCODE_GENERATION_MODE=bitcode",
"HEADER_SEARCH_PATHS=$HEADER_SEARCH_PATHS /usr/include/machine {} ".format(" ".join(plat.include_dirs)),
"-sdk", plat.sdk,
"-project", "Xcode/SDL_mixer.xcodeproj",
Expand Down
1 change: 0 additions & 1 deletion kivy_ios/recipes/sdl2_ttf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ def build_platform(self, plat):
shprint(sh.xcodebuild, self.ctx.concurrent_xcodebuild,
"ONLY_ACTIVE_ARCH=NO",
"ARCHS={}".format(plat.arch),
"BITCODE_GENERATION_MODE=bitcode",
"GENERATE_MASTER_OBJECT_FILE=YES",
"HEADER_SEARCH_PATHS={sdl_include_dir} {libpng_include_dir}".format(
sdl_include_dir=join(self.ctx.include_dir, "common", "sdl2"),
Expand Down
2 changes: 0 additions & 2 deletions kivy_ios/toolchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,6 @@ def noicctempfile():
"-O3",
self.version_min,
] + include_dirs)
if self.sdk == "iphoneos":
env["CFLAGS"] += " -fembed-bitcode"
env["LDFLAGS"] = " ".join([
"-arch", self.arch,
# "--sysroot", self.sysroot,
Expand Down
2 changes: 0 additions & 2 deletions kivy_ios/tools/cpplink
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ def call_linker(objects, output):
raise ValueError("Unsupported SDK: {}".format(sdk))

call = [ld, '-r', '-o', output + '.o', min_version_flag, '9.0', '-arch', arch]
if min_version_flag == "-ios_version_min":
call += ["-bitcode_bundle"]
call += objects
print("Linking: {}".format(" ".join(call)))
result = subprocess.run(call)
Expand Down
2 changes: 0 additions & 2 deletions kivy_ios/tools/liblink
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ elif sdk == 'iphonesimulator':
else:
raise ValueError("Unsupported SDK: {}".format(sdk))
call = [ld, '-r', '-o', output + '.o', min_version_flag, '9.0', '-arch', arch]
if min_version_flag == "-ios_version_min":
call += ["-bitcode_bundle"]
call += objects
print("Linking: {}".format(" ".join(call)))
subprocess.call(call)

0 comments on commit 3d94a16

Please sign in to comment.