Remove deprecated use of incompatible_use_toolchain_transition (#1314)
This commit is contained in:
parent
0262b1b0a0
commit
3b0ebe8094
|
@ -61,7 +61,4 @@ boost_build = rule(
|
||||||
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
|
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
|
||||||
"@bazel_tools//tools/cpp:toolchain_type",
|
"@bazel_tools//tools/cpp:toolchain_type",
|
||||||
],
|
],
|
||||||
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
|
|
||||||
# version is updated to a release of Bazel containing the new default for this setting.
|
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -421,9 +421,6 @@ cmake = rule(
|
||||||
"@bazel_tools//tools/cpp:toolchain_type",
|
"@bazel_tools//tools/cpp:toolchain_type",
|
||||||
],
|
],
|
||||||
provides = [CcInfo],
|
provides = [CcInfo],
|
||||||
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
|
|
||||||
# version is updated to a release of Bazel containing the new default for this setting.
|
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def cmake_variant(name, toolchain, **kwargs):
|
def cmake_variant(name, toolchain, **kwargs):
|
||||||
|
|
|
@ -246,9 +246,6 @@ configure_make = rule(
|
||||||
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
|
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
|
||||||
"@bazel_tools//tools/cpp:toolchain_type",
|
"@bazel_tools//tools/cpp:toolchain_type",
|
||||||
],
|
],
|
||||||
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
|
|
||||||
# version is updated to a release of Bazel containing the new default for this setting.
|
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def configure_make_variant(name, toolchain, **kwargs):
|
def configure_make_variant(name, toolchain, **kwargs):
|
||||||
|
|
|
@ -132,9 +132,6 @@ make = rule(
|
||||||
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
|
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
|
||||||
"@bazel_tools//tools/cpp:toolchain_type",
|
"@bazel_tools//tools/cpp:toolchain_type",
|
||||||
],
|
],
|
||||||
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
|
|
||||||
# version is updated to a release of Bazel containing the new default for this setting.
|
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def make_variant(name, toolchain, **kwargs):
|
def make_variant(name, toolchain, **kwargs):
|
||||||
|
|
|
@ -198,9 +198,6 @@ meson = rule(
|
||||||
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
|
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
|
||||||
"@bazel_tools//tools/cpp:toolchain_type",
|
"@bazel_tools//tools/cpp:toolchain_type",
|
||||||
],
|
],
|
||||||
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
|
|
||||||
# version is updated to a release of Bazel containing the new default for this setting.
|
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def meson_with_requirements(name, requirements, **kwargs):
|
def meson_with_requirements(name, requirements, **kwargs):
|
||||||
|
|
|
@ -118,7 +118,4 @@ ninja = rule(
|
||||||
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
|
"@rules_foreign_cc//foreign_cc/private/framework:shell_toolchain",
|
||||||
"@bazel_tools//tools/cpp:toolchain_type",
|
"@bazel_tools//tools/cpp:toolchain_type",
|
||||||
],
|
],
|
||||||
# TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported
|
|
||||||
# version is updated to a release of Bazel containing the new default for this setting.
|
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -38,7 +38,6 @@ extra_toolchains_transitioned_foreign_cc_target = rule(
|
||||||
default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
|
default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def foreign_cc_rule_variant(name, rule, toolchain, **kwargs):
|
def foreign_cc_rule_variant(name, rule, toolchain, **kwargs):
|
||||||
|
|
|
@ -99,5 +99,4 @@ native_tool_toolchain = rule(
|
||||||
allow_files = True,
|
allow_files = True,
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -52,7 +52,6 @@ current_cmake_toolchain = rule(
|
||||||
attrs = {
|
attrs = {
|
||||||
"_toolchain": attr.string(default = str(Label("//toolchains:cmake_toolchain"))),
|
"_toolchain": attr.string(default = str(Label("//toolchains:cmake_toolchain"))),
|
||||||
},
|
},
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
toolchains = [
|
toolchains = [
|
||||||
str(Label("//toolchains:cmake_toolchain")),
|
str(Label("//toolchains:cmake_toolchain")),
|
||||||
],
|
],
|
||||||
|
@ -63,7 +62,6 @@ current_make_toolchain = rule(
|
||||||
attrs = {
|
attrs = {
|
||||||
"_toolchain": attr.string(default = str(Label("//toolchains:make_toolchain"))),
|
"_toolchain": attr.string(default = str(Label("//toolchains:make_toolchain"))),
|
||||||
},
|
},
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
toolchains = [
|
toolchains = [
|
||||||
str(Label("//toolchains:make_toolchain")),
|
str(Label("//toolchains:make_toolchain")),
|
||||||
],
|
],
|
||||||
|
@ -74,7 +72,6 @@ current_ninja_toolchain = rule(
|
||||||
attrs = {
|
attrs = {
|
||||||
"_toolchain": attr.string(default = str(Label("//toolchains:ninja_toolchain"))),
|
"_toolchain": attr.string(default = str(Label("//toolchains:ninja_toolchain"))),
|
||||||
},
|
},
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
toolchains = [
|
toolchains = [
|
||||||
str(Label("//toolchains:ninja_toolchain")),
|
str(Label("//toolchains:ninja_toolchain")),
|
||||||
],
|
],
|
||||||
|
@ -85,7 +82,6 @@ current_meson_toolchain = rule(
|
||||||
attrs = {
|
attrs = {
|
||||||
"_toolchain": attr.string(default = str(Label("//toolchains:meson_toolchain"))),
|
"_toolchain": attr.string(default = str(Label("//toolchains:meson_toolchain"))),
|
||||||
},
|
},
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
toolchains = [
|
toolchains = [
|
||||||
str(Label("//toolchains:meson_toolchain")),
|
str(Label("//toolchains:meson_toolchain")),
|
||||||
],
|
],
|
||||||
|
@ -96,7 +92,6 @@ current_autoconf_toolchain = rule(
|
||||||
attrs = {
|
attrs = {
|
||||||
"_toolchain": attr.string(default = str(Label("//toolchains:autoconf_toolchain"))),
|
"_toolchain": attr.string(default = str(Label("//toolchains:autoconf_toolchain"))),
|
||||||
},
|
},
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
toolchains = [
|
toolchains = [
|
||||||
str(Label("//toolchains:autoconf_toolchain")),
|
str(Label("//toolchains:autoconf_toolchain")),
|
||||||
],
|
],
|
||||||
|
@ -107,7 +102,6 @@ current_automake_toolchain = rule(
|
||||||
attrs = {
|
attrs = {
|
||||||
"_toolchain": attr.string(default = str(Label("//toolchains:automake_toolchain"))),
|
"_toolchain": attr.string(default = str(Label("//toolchains:automake_toolchain"))),
|
||||||
},
|
},
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
toolchains = [
|
toolchains = [
|
||||||
str(Label("//toolchains:automake_toolchain")),
|
str(Label("//toolchains:automake_toolchain")),
|
||||||
],
|
],
|
||||||
|
@ -118,7 +112,6 @@ current_m4_toolchain = rule(
|
||||||
attrs = {
|
attrs = {
|
||||||
"_toolchain": attr.string(default = str(Label("//toolchains:m4_toolchain"))),
|
"_toolchain": attr.string(default = str(Label("//toolchains:m4_toolchain"))),
|
||||||
},
|
},
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
toolchains = [
|
toolchains = [
|
||||||
str(Label("//toolchains:m4_toolchain")),
|
str(Label("//toolchains:m4_toolchain")),
|
||||||
],
|
],
|
||||||
|
@ -129,7 +122,6 @@ current_pkgconfig_toolchain = rule(
|
||||||
attrs = {
|
attrs = {
|
||||||
"_toolchain": attr.string(default = str(Label("//toolchains:pkgconfig_toolchain"))),
|
"_toolchain": attr.string(default = str(Label("//toolchains:pkgconfig_toolchain"))),
|
||||||
},
|
},
|
||||||
incompatible_use_toolchain_transition = True,
|
|
||||||
toolchains = [
|
toolchains = [
|
||||||
str(Label("//toolchains:pkgconfig_toolchain")),
|
str(Label("//toolchains:pkgconfig_toolchain")),
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in New Issue