Skip to content

Commit 60a3c5b

Browse files
katrecopybara-github
authored andcommitted
Remove obsolete --toolchain_resolution_override flag.
It was made into a no-op in 2018, probably safe to delete. PiperOrigin-RevId: 559999045 Change-Id: I24f4e0cbaf7f926fdb112acf6a730e3e7f19b68c
1 parent 32d018e commit 60a3c5b

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -115,25 +115,6 @@ public static boolean platformIsDefault(Label platform) {
115115
+ "by register_toolchains().")
116116
public List<String> extraToolchains;
117117

118-
@Option(
119-
name = "toolchain_resolution_override",
120-
allowMultiple = true,
121-
defaultValue = "null",
122-
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
123-
effectTags = {
124-
OptionEffectTag.AFFECTS_OUTPUTS,
125-
OptionEffectTag.CHANGES_INPUTS,
126-
OptionEffectTag.LOADING_AND_ANALYSIS
127-
},
128-
deprecationWarning =
129-
"toolchain_resolution_override is now a no-op and will be removed in"
130-
+ " an upcoming release",
131-
help =
132-
"Override toolchain resolution for a toolchain type with a specific toolchain. "
133-
+ "Example: --toolchain_resolution_override=@io_bazel_rules_go//:toolchain="
134-
+ "@io_bazel_rules_go//:linux-arm64-toolchain")
135-
public List<String> toolchainResolutionOverrides;
136-
137118
@Option(
138119
name = "toolchain_resolution_debug",
139120
defaultValue = "-.*", // By default, exclude everything.
@@ -202,7 +183,6 @@ public PlatformOptions getExec() {
202183
exec.extraExecutionPlatforms = this.extraExecutionPlatforms;
203184
exec.extraToolchains = this.extraToolchains;
204185
exec.toolchainResolutionDebug = this.toolchainResolutionDebug;
205-
exec.toolchainResolutionOverrides = this.toolchainResolutionOverrides;
206186
exec.useToolchainResolutionForJavaRules = this.useToolchainResolutionForJavaRules;
207187
return exec;
208188
}

0 commit comments

Comments
 (0)