Remove stub toolchains for ios
Should not be needed anymore since we have dynamic configurations for a while.
RELNOTES: None.
PiperOrigin-RevId: 203435557
diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD
index 16225c4..70f9e8a 100644
--- a/tools/cpp/BUILD
+++ b/tools/cpp/BUILD
@@ -97,7 +97,6 @@
"x64_windows|compiler": ":cc-compiler-x64_windows",
"x64_windows_msvc|compiler": ":cc-compiler-x64_windows_msvc",
"ppc|compiler": ":cc-compiler-ppc",
- "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
},
)
@@ -320,32 +319,6 @@
toolchain_type = ":toolchain_type",
)
-cc_toolchain(
- name = "cc-compiler-ios_x86_64",
- all_files = ":empty",
- compiler_files = ":empty",
- cpu = "local",
- dwp_files = ":empty",
- dynamic_runtime_libs = [":empty"],
- linker_files = ":empty",
- objcopy_files = ":empty",
- static_runtime_libs = [":empty"],
- strip_files = ":empty",
- supports_param_files = 0,
-)
-
-toolchain(
- name = "cc-toolchain-ios_x86_64",
- exec_compatible_with = [
- ],
- target_compatible_with = [
- "@bazel_tools//platforms:x86_64",
- "@bazel_tools//platforms:ios",
- ],
- toolchain = ":cc-compiler-ios_x86_64",
- toolchain_type = ":toolchain_type",
-)
-
filegroup(
name = "every-file-x64_windows",
srcs = [
diff --git a/tools/cpp/BUILD.static.freebsd b/tools/cpp/BUILD.static.freebsd
index 4ec5691..b79e871 100644
--- a/tools/cpp/BUILD.static.freebsd
+++ b/tools/cpp/BUILD.static.freebsd
@@ -35,7 +35,6 @@
toolchains = {
"armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
"freebsd|compiler": ":cc-compiler-freebsd",
- "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
},
)
@@ -94,34 +93,6 @@
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)
-cc_toolchain(
- name = "cc-compiler-ios_x86_64",
- all_files = ":empty",
- compiler_files = ":empty",
- cpu = "local",
- dwp_files = ":empty",
- dynamic_runtime_libs = [":empty"],
- linker_files = ":empty",
- objcopy_files = ":empty",
- static_runtime_libs = [":empty"],
- strip_files = ":empty",
- supports_param_files = 0,
-)
-
-toolchain(
- name = "cc-toolchain-ios_x86_64",
- exec_compatible_with = [
- "@bazel_tools//platforms:x86_64",
- "@bazel_tools//platforms:osx",
- ],
- target_compatible_with = [
- "@bazel_tools//platforms:x86_64",
- "@bazel_tools//platforms:ios",
- ],
- toolchain = ":cc-compiler-ios_x86_64",
- toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
-)
-
filegroup(
name = "link_dynamic_library",
srcs = ["link_dynamic_library.sh"],
diff --git a/tools/cpp/BUILD.static.windows b/tools/cpp/BUILD.static.windows
index 6281a05..dd3ce9f 100644
--- a/tools/cpp/BUILD.static.windows
+++ b/tools/cpp/BUILD.static.windows
@@ -37,7 +37,6 @@
"x64_windows|msvc-cl": ":cc-compiler-x64_windows",
"x64_windows|msys-gcc": ":cc-compiler-x64_windows_msys",
"x64_windows|mingw-gcc": ":cc-compiler-x64_windows_mingw",
- "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
},
)
@@ -153,32 +152,6 @@
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)
-cc_toolchain(
- name = "cc-compiler-ios_x86_64",
- all_files = ":empty",
- compiler_files = ":empty",
- cpu = "local",
- dwp_files = ":empty",
- dynamic_runtime_libs = [":empty"],
- linker_files = ":empty",
- objcopy_files = ":empty",
- static_runtime_libs = [":empty"],
- strip_files = ":empty",
- supports_param_files = 0,
-)
-
-toolchain(
- name = "cc-toolchain-ios_x86_64",
- exec_compatible_with = [
- ],
- target_compatible_with = [
- "@bazel_tools//platforms:x86_64",
- "@bazel_tools//platforms:ios",
- ],
- toolchain = ":cc-compiler-ios_x86_64",
- toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
-)
-
filegroup(
name = "every-file-x64_windows",
srcs = [
diff --git a/tools/cpp/BUILD.tpl b/tools/cpp/BUILD.tpl
index f2bf8cd..4fbfa9f 100644
--- a/tools/cpp/BUILD.tpl
+++ b/tools/cpp/BUILD.tpl
@@ -49,7 +49,6 @@
toolchains = {
"%{name}|%{compiler}": ":cc-compiler-%{name}",
"armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
- "ios_x86_64|compiler": ":cc-compiler-ios_x86_64",
},
)
@@ -109,31 +108,3 @@
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)
-# ios crosstool configuration requires a default toolchain for the
-# ios_x86_64 cpu.
-cc_toolchain(
- name = "cc-compiler-ios_x86_64",
- all_files = ":empty",
- compiler_files = ":empty",
- cpu = "local",
- dwp_files = ":empty",
- dynamic_runtime_libs = [":empty"],
- linker_files = ":empty",
- objcopy_files = ":empty",
- static_runtime_libs = [":empty"],
- strip_files = ":empty",
- supports_param_files = 1,
-)
-
-toolchain(
- name = "cc-toolchain-ios_x86_64",
- exec_compatible_with = [
- # TODO(katre): add autodiscovered constraints for host CPU and OS.
- ],
- target_compatible_with = [
- "@bazel_tools//platforms:x86_64",
- "@bazel_tools//platforms:ios",
- ],
- toolchain = ":cc-compiler-ios_x86_64",
- toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
-)
diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index 1ee5786..3c7d7a8 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -53,11 +53,6 @@
toolchain_identifier: "local_linux"
}
-default_toolchain {
- cpu: "ios_x86_64"
- toolchain_identifier: "ios_x86_64"
-}
-
toolchain {
abi_version: "armeabi-v7a"
abi_libc_version: "armeabi-v7a"
@@ -904,37 +899,3 @@
compiler_flag: "-Xcompilation-mode=opt"
}
}
-
-# Stub crosstool to allow construction of apple crosstool configuration in a
-# static configuration set.
-# TODO(b/33804121): Remove this once dynamic configurations are in place.
-toolchain {
- toolchain_identifier: "ios_x86_64"
- host_system_name: "x86_64-apple-macosx"
- target_system_name: "x86_64-apple-ios"
- target_cpu: "ios_x86_64"
- target_libc: "ios"
- compiler: "compiler"
- abi_version: "local"
- abi_libc_version: "local"
- supports_gold_linker: false
- supports_incremental_linker: false
- supports_fission: false
- supports_interface_shared_objects: false
- supports_normalizing_ar: false
- supports_start_end_lib: false
-
- tool_path { name: "ar" path: "/bin/false" }
- tool_path { name: "compat-ld" path: "/bin/false" }
- tool_path { name: "cpp" path: "/bin/false" }
- tool_path { name: "dwp" path: "/bin/false" }
- tool_path { name: "gcc" path: "/bin/false" }
- tool_path { name: "gcov" path: "/bin/false" }
- tool_path { name: "ld" path: "/bin/false" }
-
- tool_path { name: "nm" path: "/bin/false" }
- tool_path { name: "objcopy" path: "/bin/false" }
- tool_path { name: "objdump" path: "/bin/false" }
- tool_path { name: "strip" path: "/bin/false" }
- linking_mode_flags { mode: DYNAMIC }
-}
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl
index cdf12fc..acc1d5f 100644
--- a/tools/cpp/CROSSTOOL.tpl
+++ b/tools/cpp/CROSSTOOL.tpl
@@ -51,16 +51,6 @@
toolchain_identifier: "%{toolchain_name}"
}
-default_toolchain {
- cpu: "local"
- toolchain_identifier: "ios_x86_64"
-}
-
-default_toolchain {
- cpu: "ios_x86_64"
- toolchain_identifier: "ios_x86_64"
-}
-
# Android tooling requires a default toolchain for the armeabi-v7a cpu.
toolchain {
abi_version: "armeabi-v7a"
@@ -96,37 +86,6 @@
}
toolchain {
- toolchain_identifier: "ios_x86_64"
- host_system_name: "x86_64-apple-macosx"
- target_system_name: "x86_64-apple-ios"
- target_cpu: "ios_x86_64"
- target_libc: "ios"
- compiler: "compiler"
- abi_version: "local"
- abi_libc_version: "local"
- supports_gold_linker: false
- supports_incremental_linker: false
- supports_fission: false
- supports_interface_shared_objects: false
- supports_normalizing_ar: false
- supports_start_end_lib: false
-
- tool_path { name: "ar" path: "/bin/false" }
- tool_path { name: "compat-ld" path: "/bin/false" }
- tool_path { name: "cpp" path: "/bin/false" }
- tool_path { name: "dwp" path: "/bin/false" }
- tool_path { name: "gcc" path: "/bin/false" }
- tool_path { name: "gcov" path: "/bin/false" }
- tool_path { name: "ld" path: "/bin/false" }
-
- tool_path { name: "nm" path: "/bin/false" }
- tool_path { name: "objcopy" path: "/bin/false" }
- tool_path { name: "objdump" path: "/bin/false" }
- tool_path { name: "strip" path: "/bin/false" }
- linking_mode_flags { mode: DYNAMIC }
-}
-
-toolchain {
toolchain_identifier: "%{toolchain_name}"
%{content}
