Skip to content

Commit

Permalink
Remove unsupported cpu attribute from cc_toolchains.
Browse files Browse the repository at this point in the history
Fixes #8236

Issue #7075

RELNOTES: None.
PiperOrigin-RevId: 247014090
  • Loading branch information
scentini authored and dkelmer committed May 7, 2019
1 parent 1d91f05 commit 88cdc94
Showing 1 changed file with 27 additions and 8 deletions.
35 changes: 27 additions & 8 deletions tools/cpp/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ cc_toolchain(
ar_files = ":empty",
as_files = ":empty",
compiler_files = ":empty",
cpu = "local",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
Expand Down Expand Up @@ -146,7 +145,6 @@ cc_toolchain(
ar_files = ":empty",
as_files = ":empty",
compiler_files = ":empty",
cpu = "ppc",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
Expand All @@ -168,13 +166,39 @@ toolchain(
toolchain_type = ":toolchain_type",
)

cc_toolchain(
name = "cc-compiler-s390x",
all_files = ":empty",
ar_files = ":empty",
as_files = ":empty",
compiler_files = ":empty",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
strip_files = ":empty",
supports_param_files = 1,
toolchain_config = ":local_linux",
toolchain_identifier = "local_linux",
)

toolchain(
name = "cc-toolchain-s390x",
exec_compatible_with = [
"@bazel_tools//platforms:s390x",
],
target_compatible_with = [
"@bazel_tools//platforms:s390x",
],
toolchain = ":cc-compiler-s390x",
toolchain_type = ":toolchain_type",
)

cc_toolchain(
name = "cc-compiler-armeabi-v7a",
all_files = ":empty",
ar_files = ":empty",
as_files = ":empty",
compiler_files = ":empty",
cpu = "local",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
Expand Down Expand Up @@ -202,7 +226,6 @@ cc_toolchain(
ar_files = ":empty",
as_files = ":empty",
compiler_files = ":empty",
cpu = "local",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
Expand Down Expand Up @@ -232,7 +255,6 @@ cc_toolchain(
ar_files = ":empty",
as_files = ":empty",
compiler_files = ":osx_wrapper",
cpu = "darwin",
dwp_files = ":empty",
linker_files = ":osx_wrapper",
objcopy_files = ":empty",
Expand Down Expand Up @@ -268,7 +290,6 @@ cc_toolchain(
ar_files = ":empty",
as_files = ":empty",
compiler_files = ":empty",
cpu = "local",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
Expand Down Expand Up @@ -304,7 +325,6 @@ cc_toolchain(
ar_files = ":empty",
as_files = ":empty",
compiler_files = ":empty",
cpu = "local",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
Expand Down Expand Up @@ -340,7 +360,6 @@ cc_toolchain(
ar_files = ":empty",
as_files = ":empty",
compiler_files = ":compile-x64_windows",
cpu = "x64_windows",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
Expand Down

0 comments on commit 88cdc94

Please sign in to comment.