Skip to content

Commit

Permalink
Remove cpp:default-toolchain
Browse files Browse the repository at this point in the history
This was disabled in bazel 1.0 but there were still a lot of remnants
around.

bazelbuild#8546

Closes bazelbuild#15003.

PiperOrigin-RevId: 446659276
  • Loading branch information
keith authored and copybara-github committed May 5, 2022
1 parent fa1081c commit 1727361
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 1,902 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -888,17 +888,6 @@ public Label getPropellerOptimizeLabel() {
+ "actions. See https://github.com/bazelbuild/bazel/issues/8531")
public boolean useSpecificToolFiles;

@Option(
name = "incompatible_disable_static_cc_toolchains",
defaultValue = "true",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
help =
"@bazel_tools//tools/cpp:default-toolchain target was removed."
+ "See https://github.com/bazelbuild/bazel/issues/8546.")
public boolean disableStaticCcToolchains;

@Option(
name = "incompatible_disable_nocopts",
defaultValue = "true",
Expand Down Expand Up @@ -1200,7 +1189,6 @@ public FragmentOptions getHost() {
host.requireCtxInConfigureFeatures = requireCtxInConfigureFeatures;
host.useStandaloneLtoIndexingCommandLines = useStandaloneLtoIndexingCommandLines;
host.useSpecificToolFiles = useSpecificToolFiles;
host.disableStaticCcToolchains = disableStaticCcToolchains;
host.disableNoCopts = disableNoCopts;
host.loadCcRulesFromBzl = loadCcRulesFromBzl;
host.validateTopLevelHeaderInclusions = validateTopLevelHeaderInclusions;
Expand Down
3 changes: 0 additions & 3 deletions src/test/shell/integration/loading_phase_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ if "$is_windows"; then
export MSYS2_ARG_CONV_EXCL="*"
fi

# Our tests use the static crosstool, so make it the default.
# add_to_bazelrc "build --crosstool_top=@bazel_tools//tools/cpp:default-toolchain"

output_base=$TEST_TMPDIR/out
TEST_stderr=$(dirname $TEST_log)/stderr

Expand Down
Loading

0 comments on commit 1727361

Please sign in to comment.