Merge "Remove build failure with USE_BAZEL_ANALYSIS usage"
This commit is contained in:
@@ -112,10 +112,6 @@ const (
|
|||||||
// checkBazelMode fails the build if there are conflicting arguments for which bazel
|
// checkBazelMode fails the build if there are conflicting arguments for which bazel
|
||||||
// build mode to use.
|
// build mode to use.
|
||||||
func checkBazelMode(ctx Context, config Config) {
|
func checkBazelMode(ctx Context, config Config) {
|
||||||
if config.Environment().IsEnvTrue("USE_BAZEL_ANALYSIS") {
|
|
||||||
ctx.Fatalln("USE_BAZEL_ANALYSIS is deprecated. Unset USE_BAZEL_ANALYSIS.\n" +
|
|
||||||
"Use --bazel-mode-dev instead. For example: `m --bazel-mode-dev nothing`")
|
|
||||||
}
|
|
||||||
if config.bazelProdMode && config.bazelDevMode {
|
if config.bazelProdMode && config.bazelDevMode {
|
||||||
ctx.Fatalln("Conflicting bazel mode.\n" +
|
ctx.Fatalln("Conflicting bazel mode.\n" +
|
||||||
"Do not specify both --bazel-mode and --bazel-mode-dev")
|
"Do not specify both --bazel-mode and --bazel-mode-dev")
|
||||||
|
Reference in New Issue
Block a user