From db77872d54ad2991e47093c998e0adc1d759719f Mon Sep 17 00:00:00 2001 From: Rosica Dejanovska Date: Mon, 31 Jul 2023 11:49:13 +0200 Subject: [PATCH 1/3] Add a bazel_feature to gate the grep_includes parameter --- features.bzl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/features.bzl b/features.bzl index a868fda..fe61b01 100644 --- a/features.bzl +++ b/features.bzl @@ -8,6 +8,9 @@ _cc = struct( # on find_cpp_toolchain are available (#17308). # Note: While the target and parameter are available in 6.1.0, they only take effect in Bazel 7. find_cpp_toolchain_has_mandatory_param = ge("6.1.0"), + # Note: In Bazel 6.3 the `grep_includes` parameter is optional and a no-op in the cc_common API + # In future Bazel versions it will be removed altogether. + remove_grep_includes_from_api = ge("6.3.0"), ) _external_deps = struct( From 85149d32c0a46da41e4a2efe81be960d7bcc8ee8 Mon Sep 17 00:00:00 2001 From: Rosica Dejanovska Date: Mon, 31 Jul 2023 14:14:08 +0200 Subject: [PATCH 2/3] Rename attribute --- features.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features.bzl b/features.bzl index fe61b01..328d23d 100644 --- a/features.bzl +++ b/features.bzl @@ -10,7 +10,7 @@ _cc = struct( find_cpp_toolchain_has_mandatory_param = ge("6.1.0"), # Note: In Bazel 6.3 the `grep_includes` parameter is optional and a no-op in the cc_common API # In future Bazel versions it will be removed altogether. - remove_grep_includes_from_api = ge("6.3.0"), + grep_includes_is_optional = ge("6.3.0"), ) _external_deps = struct( From 890e4dddfa7fe346696760da352d88ec7f0d9b72 Mon Sep 17 00:00:00 2001 From: Rosica Dejanovska Date: Mon, 31 Jul 2023 14:23:04 +0200 Subject: [PATCH 3/3] Empty