Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove cpp:default-toolchain #15003

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,14 @@ message PublishLifecycleEventRequest {
// This should match the project used for the initial call to
// PublishLifecycleEvent (containing a BuildEnqueued message).
string project_id = 6;

// Whether to require a previously received matching parent lifecycle event
// for the current request's event before continuing processing.
// - InvocationAttemptStarted and BuildFinished events require a BuildEnqueued
// parent event.
// - InvocationAttemptFinished events require an InvocationAttemptStarted
// parent event.
bool check_preceding_lifecycle_events_present = 7;
}

// States which event has been committed. Any failure to commit will cause
Expand Down Expand Up @@ -161,4 +169,10 @@ message PublishBuildToolEventStreamRequest {
// This should match the project used for the initial call to
// PublishLifecycleEvent (containing a BuildEnqueued message).
string project_id = 6;

// Whether to require a previously received matching InvocationAttemptStarted
// event before continuing event processing for the event in the current
// request. BES only performs this check for events with sequence_number 1
// i.e. the first event in the stream.
bool check_preceding_lifecycle_events_present = 7;
}
Loading