From cb0fb033bad2a73e0457f206afb87e195be93df2 Mon Sep 17 00:00:00 2001 From: hlopko Date: Thu, 5 Jul 2018 23:47:49 -0700 Subject: Remove stub toolchains for ios Should not be needed anymore since we have dynamic configurations for a while. RELNOTES: None. PiperOrigin-RevId: 203435557 --- tools/cpp/BUILD | 27 --------------------------- tools/cpp/BUILD.static.freebsd | 29 ----------------------------- tools/cpp/BUILD.static.windows | 27 --------------------------- tools/cpp/BUILD.tpl | 29 ----------------------------- tools/cpp/CROSSTOOL | 39 --------------------------------------- tools/cpp/CROSSTOOL.tpl | 41 ----------------------------------------- 6 files changed, 192 deletions(-) (limited to 'tools') diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD index 16225c40a5..70f9e8a308 100644 --- a/tools/cpp/BUILD +++ b/tools/cpp/BUILD @@ -97,7 +97,6 @@ cc_toolchain_suite( "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( 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 4ec56919bd..b79e87147a 100644 --- a/tools/cpp/BUILD.static.freebsd +++ b/tools/cpp/BUILD.static.freebsd @@ -35,7 +35,6 @@ cc_toolchain_suite( 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( 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 6281a05e75..dd3ce9fe00 100644 --- a/tools/cpp/BUILD.static.windows +++ b/tools/cpp/BUILD.static.windows @@ -37,7 +37,6 @@ cc_toolchain_suite( "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( 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 f2bf8cdefb..4fbfa9f268 100644 --- a/tools/cpp/BUILD.tpl +++ b/tools/cpp/BUILD.tpl @@ -49,7 +49,6 @@ cc_toolchain_suite( 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( 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 1ee5786a94..3c7d7a8774 100644 --- a/tools/cpp/CROSSTOOL +++ b/tools/cpp/CROSSTOOL @@ -53,11 +53,6 @@ default_toolchain { 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 @@ toolchain { 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 cdf12fc394..acc1d5fc72 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -51,16 +51,6 @@ default_toolchain { 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" @@ -95,37 +85,6 @@ toolchain { linking_mode_flags { mode: DYNAMIC } } -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} -- cgit v1.2.3