From 3af9c5efcff63c2f7b080d22b267de7fb6f14406 Mon Sep 17 00:00:00 2001 From: Luca Di Grazia Date: Sun, 4 Sep 2022 20:14:29 +0200 Subject: [PATCH] Flip --incompatible_disable_legacy_crosstool_fields and --incompatible_disable_expand_if_all_available_in_flag_set Fixes #7008 Fixes #6861 This is an encore of https://github.com/bazelbuild/bazel/commit/c18be0b0a0bf626edb98ac684fc579059af38b8c. TESTED=https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/852#5c90f69e-c5d2-44c1-8067-0bde4cba6f6d (remote execution is fixed after syncing, verified locally) RELNOTES: `--incompatible_disable_legacy_crosstool_fields` has been flipped (https://github.com/bazelbuild/bazel/issues/6861) `--incompatible_disable_expand_if_all_available_in_flag_set` has been flipped (https://github.com/bazelbuild/bazel/issues/7008) PiperOrigin-RevId: 239567807 --- .../devtools/build/lib/rules/cpp/CppOptions.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java index fdadbcedb22..21a49ee6266 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java @@ -707,20 +707,6 @@ public Label getFdoPrefetchHintsLabel() { + "(see https://github.com/bazelbuild/bazel/issues/7407 for more information).") public boolean dontEnableHostNonhost; - @Option( - name = "incompatible_require_ctx_in_configure_features", - defaultValue = "false", - documentationCategory = OptionDocumentationCategory.TOOLCHAIN, - effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, - help = - "If true, Bazel will require 'ctx' parameter in to cc_common.configure_features " - + "(see https://github.com/bazelbuild/bazel/issues/7793 for more information).") - public boolean requireCtxInConfigureFeatures; - @Option( name = "incompatible_disable_legacy_crosstool_fields", oldName = "experimental_disable_legacy_crosstool_fields", @@ -923,7 +909,6 @@ public FragmentOptions getHost() { host.enableCcToolchainResolution = enableCcToolchainResolution; host.removeLegacyWholeArchive = removeLegacyWholeArchive; host.dontEnableHostNonhost = dontEnableHostNonhost; - host.requireCtxInConfigureFeatures = requireCtxInConfigureFeatures; return host; }