Delete objc++-executable action from Apple bazel crosstools PiperOrigin-RevId: 510138044 Change-Id: Ie3798e661ed162ff7302ca4fad61f9d2a3f4e40a
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl b/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl index 929b123..aeea9d6 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl +++ b/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl
@@ -38,14 +38,10 @@ ACTION_NAMES.cpp_link_nodeps_dynamic_library, ] -# Link actions using the ObjC bazel actions. -_OBJC_LINK_ACTIONS = [ +_ALL_LINK_ACTIONS = _NON_OBJC_LINK_ACTIONS + [ ACTION_NAMES.objc_executable, - ACTION_NAMES.objcpp_executable, ] -_ALL_LINK_ACTIONS = _NON_OBJC_LINK_ACTIONS + _OBJC_LINK_ACTIONS - _archive_param_file_feature = feature( name = "archive_param_file", ) @@ -1035,729 +1031,6 @@ objc_executable_action = None if (ctx.attr.cpu == "x64_windows"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch <architecture>"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "<tool_dir>/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - elif (ctx.attr.cpu == "ios_arm64"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch arm64"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "ios/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - elif (ctx.attr.cpu == "tvos_arm64"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch arm64"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "tvos/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - elif (ctx.attr.cpu == "ios_armv7"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch armv7"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "ios/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - elif (ctx.attr.cpu == "watchos_armv7k"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch armv7k"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "watchos/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - elif (ctx.attr.cpu == "watchos_arm64_32"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch arm64_32"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "watchos/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - elif (ctx.attr.cpu == "ios_i386"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch i386"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "iossim/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - elif (ctx.attr.cpu == "watchos_i386"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch i386"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "watchsim/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - elif (ctx.attr.cpu == "watchos_x86_64"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch x86_64"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "watchsim/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - elif (ctx.attr.cpu == "ios_x86_64"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch x86_64"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "iossim/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - elif (ctx.attr.cpu == "darwin_x86_64"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch x86_64"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "mac/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - elif (ctx.attr.cpu == "tvos_x86_64"): - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group(flags = ["-arch x86_64"]), - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - flag_group( - flags = ["-framework %{framework_names}"], - iterate_over = "framework_names", - ), - flag_group( - flags = ["-weak_framework %{weak_framework_names}"], - iterate_over = "weak_framework_names", - ), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist %{filelist}"]), - flag_group(flags = ["-o %{linked_binary}"]), - flag_group( - flags = ["-force_load %{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "version_min", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "tvsim/wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - else: - objcpp_executable_action = None - - if (ctx.attr.cpu == "x64_windows"): cpp_link_executable_action = action_config( action_name = ACTION_NAMES.cpp_link_executable, implies = [ @@ -5543,7 +4816,6 @@ assemble_action, preprocess_assemble_action, objc_executable_action, - objcpp_executable_action, cpp_link_executable_action, cpp_link_dynamic_library_action, cpp_link_nodeps_dynamic_library_action, @@ -5591,7 +4863,7 @@ name = "apply_implicit_frameworks", flag_sets = [ flag_set( - actions = ["objc-executable", "objc++-executable"], + actions = ["objc-executable"], flag_groups = [ flag_group( flags = ["-framework Foundation", "-framework UIKit"], @@ -5605,7 +4877,7 @@ name = "apply_implicit_frameworks", flag_sets = [ flag_set( - actions = ["objc-executable", "objc++-executable"], + actions = ["objc-executable"], flag_groups = [flag_group(flags = ["-framework Foundation"])], ), ], @@ -5995,7 +5267,6 @@ flag_set( actions = [ "objc-executable", - "objc++-executable", ACTION_NAMES.cpp_link_executable, ACTION_NAMES.cpp_link_dynamic_library, ACTION_NAMES.cpp_link_nodeps_dynamic_library, @@ -6023,7 +5294,6 @@ flag_set( actions = [ "objc-executable", - "objc++-executable", ACTION_NAMES.cpp_link_executable, ACTION_NAMES.cpp_link_dynamic_library, ACTION_NAMES.cpp_link_nodeps_dynamic_library, @@ -6051,7 +5321,6 @@ flag_set( actions = [ "objc-executable", - "objc++-executable", ACTION_NAMES.cpp_link_executable, ACTION_NAMES.cpp_link_dynamic_library, ACTION_NAMES.cpp_link_nodeps_dynamic_library, @@ -6078,7 +5347,6 @@ flag_set( actions = [ "objc-executable", - "objc++-executable", ACTION_NAMES.cpp_link_executable, ACTION_NAMES.cpp_link_dynamic_library, ACTION_NAMES.cpp_link_nodeps_dynamic_library, @@ -6106,7 +5374,6 @@ flag_set( actions = [ "objc-executable", - "objc++-executable", ACTION_NAMES.cpp_link_executable, ACTION_NAMES.cpp_link_dynamic_library, ACTION_NAMES.cpp_link_nodeps_dynamic_library, @@ -6134,7 +5401,6 @@ flag_set( actions = [ "objc-executable", - "objc++-executable", ACTION_NAMES.cpp_link_executable, ACTION_NAMES.cpp_link_dynamic_library, ACTION_NAMES.cpp_link_nodeps_dynamic_library, @@ -6161,7 +5427,6 @@ flag_set( actions = [ "objc-executable", - "objc++-executable", ACTION_NAMES.cpp_link_executable, ACTION_NAMES.cpp_link_dynamic_library, ACTION_NAMES.cpp_link_nodeps_dynamic_library, @@ -6186,7 +5451,6 @@ flag_set( actions = [ "objc-executable", - "objc++-executable", ACTION_NAMES.cpp_link_executable, ACTION_NAMES.cpp_link_dynamic_library, ACTION_NAMES.cpp_link_nodeps_dynamic_library, @@ -6268,7 +5532,6 @@ ACTION_NAMES.cpp_link_nodeps_dynamic_library, ACTION_NAMES.cpp_link_executable, "objc-executable", - "objc++-executable", ], flag_groups = [flag_group(flags = ["-fprofile-instr-generate"])], ), @@ -6334,12 +5597,11 @@ ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile, "objc-executable", - "objc++-executable", ], flag_groups = [flag_group(flags = ["-fembed-bitcode"])], ), flag_set( - actions = ["objc-executable", "objc++-executable"], + actions = ["objc-executable"], flag_groups = [ flag_group( flags = [ @@ -6978,7 +6240,7 @@ name = "generate_linkmap", flag_sets = [ flag_set( - actions = ["objc-executable", "objc++-executable"], + actions = ["objc-executable"], flag_groups = [ flag_group( flags = ["-Xlinker -map", "-Xlinker %{linkmap_exec_path}"], @@ -7207,12 +6469,11 @@ ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile, "objc-executable", - "objc++-executable", ], flag_groups = [flag_group(flags = ["-g", "-DDUMMY_GENERATE_DSYM_FILE"])], ), flag_set( - actions = ["objc-executable", "objc++-executable"], + actions = ["objc-executable"], flag_groups = [ flag_group( flags = [ @@ -7249,7 +6510,7 @@ name = "link_cocoa", flag_sets = [ flag_set( - actions = _OBJC_LINK_ACTIONS, + actions = [ACTION_NAMES.objc_executable], flag_groups = [flag_group(flags = ["-framework Cocoa"])], ), ], @@ -7276,7 +6537,6 @@ "objc++-compile", "objc-fully-link", "objc-executable", - "objc++-executable", "assemble", "preprocess-assemble", "c-compile", @@ -7332,7 +6592,6 @@ ACTION_NAMES.cpp_link_nodeps_dynamic_library, ACTION_NAMES.cpp_link_static_library, "objc-executable", - "objc++-executable", ], env_entries = [ env_entry( @@ -7744,7 +7003,6 @@ ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile, "objc-executable", - "objc++-executable", ], flag_groups = [flag_group(flags = ["-fembed-bitcode-marker"])], ), @@ -7961,7 +7219,6 @@ flag_set( actions = [ "objc-executable", - "objc++-executable", ], flag_groups = [ flag_group( @@ -8048,7 +7305,6 @@ ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile, "objc-executable", - "objc++-executable", ], flag_groups = [ flag_group( @@ -8160,7 +7416,6 @@ ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile, "objc-executable", - "objc++-executable", ACTION_NAMES.assemble, ACTION_NAMES.preprocess_assemble, ], @@ -8197,7 +7452,6 @@ ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile, "objc-executable", - "objc++-executable", ACTION_NAMES.assemble, ACTION_NAMES.preprocess_assemble, ],
diff --git a/tools/build_defs/cc/action_names.bzl b/tools/build_defs/cc/action_names.bzl index 55da4e8..f377eca 100644 --- a/tools/build_defs/cc/action_names.bzl +++ b/tools/build_defs/cc/action_names.bzl
@@ -82,9 +82,6 @@ # A string constant for the objc executable link action. OBJC_EXECUTABLE_ACTION_NAME = "objc-executable" -# A string constant for the objc++ executable link action. -OBJCPP_EXECUTABLE_ACTION_NAME = "objc++-executable" - # A string constant for the objc fully-link link action. OBJC_FULLY_LINK_ACTION_NAME = "objc-fully-link" @@ -119,7 +116,6 @@ objc_executable = OBJC_EXECUTABLE_ACTION_NAME, objc_fully_link = OBJC_FULLY_LINK_ACTION_NAME, objcpp_compile = OBJCPP_COMPILE_ACTION_NAME, - objcpp_executable = OBJCPP_EXECUTABLE_ACTION_NAME, clif_match = CLIF_MATCH_ACTION_NAME, objcopy_embed_data = OBJ_COPY_ACTION_NAME, )
diff --git a/tools/osx/crosstool/cc_toolchain_config.bzl b/tools/osx/crosstool/cc_toolchain_config.bzl index 9a1527d..4529fa9 100644 --- a/tools/osx/crosstool/cc_toolchain_config.bzl +++ b/tools/osx/crosstool/cc_toolchain_config.bzl
@@ -246,63 +246,6 @@ ], ) - objcpp_executable_action = action_config( - action_name = "objc++-executable", - flag_sets = [ - flag_set( - flag_groups = [ - flag_group( - flags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - "-fobjc-link-runtime", - "-ObjC", - ], - ), - ], - with_features = [with_feature_set(not_features = ["kernel_extension"])], - ), - flag_set( - flag_groups = [ - flag_group(flags = ["-target", target_system_name]), - flag_group( - flags = ["-l%{library_names}"], - iterate_over = "library_names", - ), - flag_group(flags = ["-filelist", "%{filelist}"]), - flag_group(flags = ["-o", "%{linked_binary}"]), - flag_group( - flags = ["-force_load", "%{force_load_exec_paths}"], - iterate_over = "force_load_exec_paths", - ), - flag_group( - flags = ["%{dep_linkopts}"], - iterate_over = "dep_linkopts", - ), - flag_group( - flags = ["-Wl,%{attr_linkopts}"], - iterate_over = "attr_linkopts", - ), - ], - ), - ], - implies = [ - "include_system_dirs", - "framework_paths", - "strip_debug_symbols", - "apple_env", - "apply_implicit_frameworks", - ], - tools = [ - tool( - path = "wrapped_clang", - execution_requirements = xcode_execution_requirements, - ), - ], - ) - cpp_link_dynamic_library_action = action_config( action_name = ACTION_NAMES.cpp_link_dynamic_library, implies = [ @@ -683,7 +626,6 @@ assemble_action, preprocess_assemble_action, objc_executable_action, - objcpp_executable_action, cpp_link_executable_action, cpp_link_dynamic_library_action, cpp_link_nodeps_dynamic_library_action, @@ -860,8 +802,7 @@ name = "strip_debug_symbols", flag_sets = [ flag_set( - actions = all_link_actions + - ["objc-executable", "objc++-executable"], + actions = all_link_actions + ["objc-executable"], flag_groups = [ flag_group( flags = ["-Wl,-S"], @@ -925,8 +866,7 @@ enabled = True, flag_sets = [ flag_set( - actions = all_link_actions + - ["objc-executable", "objc++-executable"], + actions = all_link_actions + ["objc-executable"], flag_groups = [ flag_group( flags = ["%{user_link_flags}"], @@ -1054,8 +994,7 @@ enabled = True, flag_sets = [ flag_set( - actions = all_link_actions + - ["objc-executable", "objc++-executable"], + actions = all_link_actions + ["objc-executable"], flag_groups = [ flag_group( flags = [ @@ -1074,8 +1013,7 @@ enabled = True, flag_sets = [ flag_set( - actions = all_link_actions + - ["objc-executable", "objc++-executable"], + actions = all_link_actions + ["objc-executable"], flag_groups = [ flag_group( flags = [ @@ -1147,10 +1085,7 @@ ], ), flag_set( - actions = [ - "objc-executable", - "objc++-executable", - ], + actions = ["objc-executable"], flag_groups = [ flag_group( flags = ["-F%{framework_paths}"], @@ -1243,7 +1178,6 @@ ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile, "objc-executable", - "objc++-executable", ACTION_NAMES.assemble, ACTION_NAMES.preprocess_assemble, ], @@ -1475,7 +1409,6 @@ ACTION_NAMES.cpp_link_nodeps_dynamic_library, ACTION_NAMES.cpp_link_static_library, "objc-executable", - "objc++-executable", ACTION_NAMES.linkstamp_compile, ], env_entries = [ @@ -1518,7 +1451,7 @@ name = "apply_implicit_frameworks", flag_sets = [ flag_set( - actions = ["objc-executable", "objc++-executable"], + actions = ["objc-executable"], flag_groups = [ flag_group( flags = ["-framework", "Foundation", "-framework", "UIKit"], @@ -1534,7 +1467,7 @@ name = "apply_implicit_frameworks", flag_sets = [ flag_set( - actions = ["objc-executable", "objc++-executable"], + actions = ["objc-executable"], flag_groups = [flag_group(flags = ["-framework", "Foundation"])], with_features = [with_feature_set(not_features = ["kernel_extension"])], ), @@ -1592,7 +1525,6 @@ ACTION_NAMES.cpp_link_nodeps_dynamic_library, ACTION_NAMES.cpp_link_executable, "objc-executable", - "objc++-executable", ], flag_groups = [flag_group(flags = ["-fprofile-instr-generate"])], ), @@ -1668,8 +1600,7 @@ enabled = True, flag_sets = [ flag_set( - actions = all_link_actions + - ["objc-executable", "objc++-executable"], + actions = all_link_actions + ["objc-executable"], flag_groups = [flag_group(flags = ["-lc++"])], with_features = [with_feature_set(not_features = ["kernel_extension"])], ), @@ -1680,10 +1611,8 @@ name = "objc_actions", implies = [ "objc-compile", - "objc++-compile", "objc-fully-link", "objc-executable", - "objc++-executable", "assemble", "preprocess-assemble", "c-compile", @@ -1736,7 +1665,6 @@ ACTION_NAMES.cpp_link_static_library, ACTION_NAMES.objc_fully_link, ACTION_NAMES.objc_executable, - ACTION_NAMES.objcpp_executable, ], flag_groups = [ flag_group( @@ -1754,7 +1682,6 @@ env_set( actions = all_link_actions + [ ACTION_NAMES.objc_executable, - ACTION_NAMES.objcpp_executable, ], env_entries = [ env_entry( @@ -2070,8 +1997,7 @@ name = "dead_strip", flag_sets = [ flag_set( - actions = all_link_actions + - ["objc-executable", "objc++-executable"], + actions = all_link_actions + ["objc-executable"], flag_groups = [ flag_group( flags = ["-dead_strip"], @@ -2086,8 +2012,7 @@ name = "oso_prefix_is_pwd", flag_sets = [ flag_set( - actions = all_link_actions + - ["objc-executable", "objc++-executable"], + actions = all_link_actions + ["objc-executable"], flag_groups = [flag_group(flags = ["OSO_PREFIX_MAP_PWD"])], ), ], @@ -2103,12 +2028,11 @@ ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile, "objc-executable", - "objc++-executable", ], flag_groups = [flag_group(flags = ["-g"])], ), flag_set( - actions = ["objc-executable", "objc++-executable"], + actions = ["objc-executable"], flag_groups = [ flag_group( flags = [ @@ -2128,7 +2052,7 @@ name = "kernel_extension", flag_sets = [ flag_set( - actions = ["objc-executable", "objc++-executable"], + actions = ["objc-executable"], flag_groups = [ flag_group( flags = [ @@ -2281,7 +2205,7 @@ name = "link_cocoa", flag_sets = [ flag_set( - actions = ["objc-executable", "objc++-executable"], + actions = ["objc-executable"], flag_groups = [flag_group(flags = ["-framework", "Cocoa"])], ), ], @@ -2323,7 +2247,6 @@ flag_set( actions = all_link_actions + [ ACTION_NAMES.objc_executable, - ACTION_NAMES.objcpp_executable, ], flag_groups = [flag_group(flags = ["-headerpad_max_install_names"])], with_features = [with_feature_set(not_features = [ @@ -2358,7 +2281,6 @@ flag_set( actions = all_link_actions + [ ACTION_NAMES.objc_executable, - ACTION_NAMES.objcpp_executable, ], flag_groups = [ flag_group( @@ -2394,7 +2316,6 @@ flag_set( actions = all_link_actions + [ ACTION_NAMES.objc_executable, - ACTION_NAMES.objcpp_executable, ], flag_groups = [flag_group(flags = ["-fembed-bitcode-marker"])], ), @@ -2410,7 +2331,6 @@ flag_set( actions = [ ACTION_NAMES.objc_executable, - ACTION_NAMES.objcpp_executable, ], flag_groups = [ flag_group( @@ -2470,7 +2390,6 @@ ACTION_NAMES.cpp_link_dynamic_library, ACTION_NAMES.cpp_link_nodeps_dynamic_library, ACTION_NAMES.objc_executable, - ACTION_NAMES.objcpp_executable, ], flag_groups = [ flag_group(flags = ["-fsanitize=address"]), @@ -2505,7 +2424,6 @@ ACTION_NAMES.cpp_link_dynamic_library, ACTION_NAMES.cpp_link_nodeps_dynamic_library, ACTION_NAMES.objc_executable, - ACTION_NAMES.objcpp_executable, ], flag_groups = [ flag_group(flags = ["-fsanitize=thread"]), @@ -2540,7 +2458,6 @@ ACTION_NAMES.cpp_link_dynamic_library, ACTION_NAMES.cpp_link_nodeps_dynamic_library, ACTION_NAMES.objc_executable, - ACTION_NAMES.objcpp_executable, ], flag_groups = [ flag_group(flags = ["-fsanitize=undefined"]),