Fix Some Compilation Errors for Strict C++ Toolchains
Commands like `coverage` which compile zlib and ijar can error out if the user's C++ toolchain has strict warnings and `-Werror` enabled, this PR adds `-Wno-error` to fix that. I also added `-Wno-old-style-cast` because that's the warning in particular that's causing problems for me.
Closes #9069.
PiperOrigin-RevId: 265629107
diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools
index 59127b4..8ccde87 100644
--- a/tools/jdk/BUILD.java_tools
+++ b/tools/jdk/BUILD.java_tools
@@ -6,6 +6,14 @@
load("@rules_java//java:defs.bzl", "java_binary", "java_import", "java_toolchain")
load("@rules_proto//proto:defs.bzl", "proto_library")
+SUPRESSED_WARNINGS = select({
+ ":windows": [],
+ "//conditions:default": [
+ "-Wno-error",
+ "-Wno-old-style-cast",
+ ],
+})
+
java_toolchain(
name = "toolchain",
bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"],
@@ -413,6 +421,7 @@
"java_tools/ijar/classfile.cc",
"java_tools/ijar/ijar.cc",
],
+ copts = SUPRESSED_WARNINGS,
# Remove dependency on @bazel_tools//tools/cpp:malloc, which avoid /Iexternal/tools being used
# in compiling actions.
malloc = ":malloc",
@@ -436,6 +445,7 @@
"java_tools/ijar/mapped_file.h",
"java_tools/ijar/zip.h",
],
+ copts = SUPRESSED_WARNINGS,
include_prefix = "third_party",
strip_include_prefix = "java_tools",
deps = [
@@ -460,6 +470,7 @@
"java_tools/ijar/common.h",
"java_tools/ijar/platform_utils.h",
],
+ copts = SUPRESSED_WARNINGS,
include_prefix = "third_party",
strip_include_prefix = "java_tools",
visibility = ["//visibility:private"],
@@ -582,6 +593,7 @@
name = "strings",
srcs = ["java_tools/src/main/cpp/util/strings.cc"],
hdrs = ["java_tools/src/main/cpp/util/strings.h"],
+ copts = SUPRESSED_WARNINGS,
# Automatically propagate the symbol definition to rules depending on this.
defines = [
"BLAZE_OPENSOURCE",
@@ -593,6 +605,7 @@
cc_library(
name = "blaze_exit_code",
hdrs = ["java_tools/src/main/cpp/util/exit_code.h"],
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
)
@@ -600,6 +613,7 @@
name = "port",
srcs = ["java_tools/src/main/cpp/util/port.cc"],
hdrs = ["java_tools/src/main/cpp/util/port.h"],
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
)
@@ -607,6 +621,7 @@
name = "logging",
srcs = ["java_tools/src/main/cpp/util/logging.cc"],
hdrs = ["java_tools/src/main/cpp/util/logging.h"],
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
deps = [
":blaze_exit_code",
@@ -621,6 +636,7 @@
"java_tools/ijar/common.h",
"java_tools/ijar/zlib_client.h",
],
+ copts = SUPRESSED_WARNINGS,
include_prefix = "third_party",
strip_include_prefix = "java_tools",
deps = ["//java_tools/zlib"],
@@ -633,6 +649,7 @@
srcs = [
"java_tools/src/tools/singlejar/singlejar_main.cc",
],
+ copts = SUPRESSED_WARNINGS,
linkopts = select({
":freebsd": ["-lm"],
"//conditions:default": [],
@@ -654,6 +671,7 @@
srcs = [
"java_tools/src/tools/singlejar/singlejar_local_main.cc",
],
+ copts = SUPRESSED_WARNINGS,
linkopts = select({
":freebsd": ["-lm"],
"//conditions:default": [],
@@ -679,6 +697,7 @@
":transient_bytes",
":zip_headers",
],
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
deps = [
"//java_tools/zlib",
@@ -699,6 +718,7 @@
name = "desugar_checking",
srcs = ["java_tools/src/tools/singlejar/desugar_checking.cc"],
hdrs = ["java_tools/src/tools/singlejar/desugar_checking.h"],
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
deps = [
":combiners",
@@ -709,6 +729,7 @@
cc_library(
name = "diag",
hdrs = ["java_tools/src/tools/singlejar/diag.h"],
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
visibility = ["//visibility:private"],
)
@@ -716,6 +737,7 @@
cc_library(
name = "singlejar_port",
hdrs = ["java_tools/src/tools/singlejar/port.h"],
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
visibility = ["//visibility:private"],
)
@@ -728,6 +750,7 @@
":windows": ["java_tools/src/tools/singlejar/mapped_file_windows.inc"],
"//conditions:default": ["java_tools/src/tools/singlejar/mapped_file_posix.inc"],
}),
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
visibility = ["//visibility:private"],
deps = [
@@ -746,6 +769,7 @@
"java_tools/src/tools/singlejar/input_jar.h",
"java_tools/src/tools/singlejar/zip_headers.h",
],
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
deps = [
":diag",
@@ -760,6 +784,7 @@
"java_tools/src/tools/singlejar/options.h",
],
hdrs = ["java_tools/src/tools/singlejar/options.h"],
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
deps = [
":diag",
@@ -775,6 +800,7 @@
":zip_headers",
],
hdrs = ["java_tools/src/tools/singlejar/output_jar.h"],
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
deps = [
":combiners",
@@ -791,6 +817,7 @@
cc_library(
name = "token_stream",
hdrs = ["java_tools/src/tools/singlejar/token_stream.h"],
+ copts = SUPRESSED_WARNINGS,
strip_include_prefix = "java_tools",
deps = [
":diag",
