Add incompatible_use_toolchain_transition = True as per bazelbuild/bazel#11584 (#617)

jsharpe · web-flow · commit b66074cdd255 · 2021-04-19T08:01:50.000-07:00
diff --git a/foreign_cc/boost_build.bzl b/foreign_cc/boost_build.bzl
@@ -54,4 +54,7 @@ boost_build = rule(
         "@rules_foreign_cc//foreign_cc/private/shell_toolchain/toolchains:shell_commands",
         "@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,
 )
diff --git a/foreign_cc/cmake.bzl b/foreign_cc/cmake.bzl
@@ -282,4 +282,7 @@ cmake = rule(
         "@rules_foreign_cc//foreign_cc/private/shell_toolchain/toolchains:shell_commands",
         "@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,
 )
diff --git a/foreign_cc/configure.bzl b/foreign_cc/configure.bzl
@@ -214,4 +214,7 @@ configure_make = rule(
         "@rules_foreign_cc//foreign_cc/private/shell_toolchain/toolchains:shell_commands",
         "@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,
 )
diff --git a/foreign_cc/make.bzl b/foreign_cc/make.bzl
@@ -99,4 +99,7 @@ make = rule(
         "@rules_foreign_cc//foreign_cc/private/shell_toolchain/toolchains:shell_commands",
         "@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,
 )
diff --git a/foreign_cc/ninja.bzl b/foreign_cc/ninja.bzl
@@ -116,4 +116,7 @@ ninja = rule(
         "@rules_foreign_cc//foreign_cc/private/shell_toolchain/toolchains:shell_commands",
         "@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,
 )

Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,7 @@ boost_build = rule(`
`54`	`54`	`"@rules_foreign_cc//foreign_cc/private/shell_toolchain/toolchains:shell_commands",`
`55`	`55`	`"@bazel_tools//tools/cpp:toolchain_type",`
`56`	`56`	`],`
	`57`	`+ # TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported`
	`58`	`+ # version is updated to a release of Bazel containing the new default for this setting.`
	`59`	`+ incompatible_use_toolchain_transition = True,`
`57`	`60`	`)`
Original file line number	Diff line number	Diff line change
`@@ -282,4 +282,7 @@ cmake = rule(`
`282`	`282`	`"@rules_foreign_cc//foreign_cc/private/shell_toolchain/toolchains:shell_commands",`
`283`	`283`	`"@bazel_tools//tools/cpp:toolchain_type",`
`284`	`284`	`],`
	`285`	`+ # TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported`
	`286`	`+ # version is updated to a release of Bazel containing the new default for this setting.`
	`287`	`+ incompatible_use_toolchain_transition = True,`
`285`	`288`	`)`
Original file line number	Diff line number	Diff line change
`@@ -214,4 +214,7 @@ configure_make = rule(`
`214`	`214`	`"@rules_foreign_cc//foreign_cc/private/shell_toolchain/toolchains:shell_commands",`
`215`	`215`	`"@bazel_tools//tools/cpp:toolchain_type",`
`216`	`216`	`],`
	`217`	`+ # TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported`
	`218`	`+ # version is updated to a release of Bazel containing the new default for this setting.`
	`219`	`+ incompatible_use_toolchain_transition = True,`
`217`	`220`	`)`
Original file line number	Diff line number	Diff line change
`@@ -99,4 +99,7 @@ make = rule(`
`99`	`99`	`"@rules_foreign_cc//foreign_cc/private/shell_toolchain/toolchains:shell_commands",`
`100`	`100`	`"@bazel_tools//tools/cpp:toolchain_type",`
`101`	`101`	`],`
	`102`	`+ # TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported`
	`103`	`+ # version is updated to a release of Bazel containing the new default for this setting.`
	`104`	`+ incompatible_use_toolchain_transition = True,`
`102`	`105`	`)`
Original file line number	Diff line number	Diff line change
`@@ -116,4 +116,7 @@ ninja = rule(`
`116`	`116`	`"@rules_foreign_cc//foreign_cc/private/shell_toolchain/toolchains:shell_commands",`
`117`	`117`	`"@bazel_tools//tools/cpp:toolchain_type",`
`118`	`118`	`],`
	`119`	`+ # TODO: Remove once https://github.com/bazelbuild/bazel/issues/11584 is closed and the min supported`
	`120`	`+ # version is updated to a release of Bazel containing the new default for this setting.`
	`121`	`+ incompatible_use_toolchain_transition = True,`
`119`	`122`	`)`