From 358b48dc263497459251813df238f61c47db1c84 Mon Sep 17 00:00:00 2001 From: hlopko Date: Tue, 10 Apr 2018 15:37:23 +0200 Subject: [PATCH] Remove traces of optional_flags from crosstool AFAIK all uses have been migrated to features, so they are not needed anymore. RELNOTES: CppRules: optional_compiler_flag was removed from CROSSTOOL, use features instead. PiperOrigin-RevId: 192277764 --- .../src/main/protobuf/crosstool_config.proto | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/third_party/com/github/bazelbuild/bazel/src/main/protobuf/crosstool_config.proto b/third_party/com/github/bazelbuild/bazel/src/main/protobuf/crosstool_config.proto index 3e6b184..3663f72 100644 --- a/third_party/com/github/bazelbuild/bazel/src/main/protobuf/crosstool_config.proto +++ b/third_party/com/github/bazelbuild/bazel/src/main/protobuf/crosstool_config.proto @@ -40,13 +40,6 @@ package com.google.devtools.build.lib.view.config.crosstool; // exectuable. In particular, it is used to check if the compilation products of // a toolchain can run on the host machine. message CToolchain { - // Optional flag. Some option lists have a corresponding optional flag list. - // These are appended at the end of the option list in case the corresponding - // default setting is set. - message OptionalFlag { - required string default_setting_name = 1; - repeated string flag = 2; - } // A group of correlated flags. Supports parametrization via variable // expansion. @@ -380,7 +373,6 @@ message CToolchain { // Compiler flags for C/C++/Asm compilation. repeated string compiler_flag = 13; - repeated OptionalFlag optional_compiler_flag = 35; // Additional compiler flags for C++ compilation. repeated string cxx_flag = 14; // Additional unfiltered compiler flags for C/C++/Asm compilation. @@ -538,11 +530,6 @@ message DefaultCpuToolchain { // cpu, a default toolchain for each supported cpu type, and a set of // toolchains. message CrosstoolRelease { - message DefaultSetting { - required string name = 1; - required bool default_value = 2; - } - // The major and minor version of the crosstool release. required string major_version = 1; required string minor_version = 2; @@ -554,9 +541,6 @@ message CrosstoolRelease { // The default toolchain to use for each given cpu. repeated DefaultCpuToolchain default_toolchain = 4; - // The default settings used in this release. - repeated DefaultSetting default_setting = 6; - // All the toolchains in this release. repeated CToolchain toolchain = 5; }