summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Smiley <keithbsmiley@gmail.com>2023-05-05 07:26:37 -0700
committerGitHub <noreply@github.com>2023-05-05 14:26:37 +0000
commit38eba0f2537669e3878b78fc9b7308d95b51a11e (patch)
treecc69689849c5116f3a72fafcc53b075c5ab57cc6
parent40306d1599fdb7924c4bbd63a0cdb766f120ec69 (diff)
downloadbazelbuild-apple_support-38eba0f2537669e3878b78fc9b7308d95b51a11e.tar.gz
Remove support for bitcode (#218)upstream/1.6.0
Now that Xcode 14.1 is the minimum supported to the App Store, and Xcode 14.0 dropped support for bitcode, we don't need to handle these flags anymore.
-rw-r--r--crosstool/cc_toolchain_config.bzl70
1 files changed, 0 insertions, 70 deletions
diff --git a/crosstool/cc_toolchain_config.bzl b/crosstool/cc_toolchain_config.bzl
index 079b132..6087376 100644
--- a/crosstool/cc_toolchain_config.bzl
+++ b/crosstool/cc_toolchain_config.bzl
@@ -2262,78 +2262,10 @@ def _impl(ctx):
flag_set(
actions = _DYNAMIC_LINK_ACTIONS,
flag_groups = [flag_group(flags = ["-headerpad_max_install_names"])],
- with_features = [with_feature_set(not_features = [
- "bitcode_embedded",
- "bitcode_embedded_markers",
- ])],
),
],
)
- if (ctx.attr.cpu == "ios_arm64" or
- ctx.attr.cpu == "ios_arm64e" or
- ctx.attr.cpu == "ios_armv7" or
- ctx.attr.cpu == "tvos_arm64" or
- ctx.attr.cpu == "watchos_arm64_32" or
- ctx.attr.cpu == "watchos_armv7k" or
- ctx.attr.cpu == "darwin_x86_64" or
- ctx.attr.cpu == "darwin_arm64" or
- ctx.attr.cpu == "darwin_arm64e"):
- bitcode_embedded_feature = feature(
- name = "bitcode_embedded",
- flag_sets = [
- flag_set(
- actions = [
- ACTION_NAMES.c_compile,
- ACTION_NAMES.cpp_compile,
- ACTION_NAMES.objc_compile,
- ACTION_NAMES.objcpp_compile,
- ],
- flag_groups = [flag_group(flags = ["-fembed-bitcode"])],
- ),
- flag_set(
- actions = _DYNAMIC_LINK_ACTIONS,
- flag_groups = [
- flag_group(
- flags = [
- "-fembed-bitcode",
- "-Xlinker",
- "-bitcode_verify",
- "-Xlinker",
- "-bitcode_hide_symbols",
- "-Xlinker",
- "-bitcode_symbol_map",
- "-Xlinker",
- "%{bitcode_symbol_map_path}",
- ],
- expand_if_available = "bitcode_symbol_map_path",
- ),
- ],
- ),
- ],
- )
- bitcode_embedded_markers_feature = feature(
- name = "bitcode_embedded_markers",
- flag_sets = [
- flag_set(
- actions = [
- ACTION_NAMES.c_compile,
- ACTION_NAMES.cpp_compile,
- ACTION_NAMES.objc_compile,
- ACTION_NAMES.objcpp_compile,
- ],
- flag_groups = [flag_group(flags = ["-fembed-bitcode-marker"])],
- ),
- flag_set(
- actions = _DYNAMIC_LINK_ACTIONS,
- flag_groups = [flag_group(flags = ["-fembed-bitcode-marker"])],
- ),
- ],
- )
- else:
- bitcode_embedded_markers_feature = feature(name = "bitcode_embedded_markers")
- bitcode_embedded_feature = feature(name = "bitcode_embedded")
-
generate_linkmap_feature = feature(
name = "generate_linkmap",
flag_sets = [
@@ -2564,8 +2496,6 @@ def _impl(ctx):
apply_default_compiler_flags_feature,
include_system_dirs_feature,
headerpad_feature,
- bitcode_embedded_feature,
- bitcode_embedded_markers_feature,
objc_arc_feature,
no_objc_arc_feature,
apple_env_feature,