Prepare the codebase for the --incompatible_disable_legacy_crosstool_fields
All the tests pass with the flag flipped.
https://github.com/bazelbuild/bazel/issues/6861
RELNOTES: None.
PiperOrigin-RevId: 235721486
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java
index 5671e53..5c37cea 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java
@@ -145,6 +145,7 @@
Joiner.on("\n")
.join(
" name: 'pic'",
+ " enabled: true",
" flag_set {",
" action: 'assemble'",
" action: 'preprocess-assemble'",
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
index f5bca63..6da44d4 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
@@ -570,6 +570,7 @@
}
feature {
name: "module_maps"
+ enabled: true
}
feature {
name: "use_objc_modules"
@@ -634,6 +635,7 @@
iterate_over: "preprocessor_defines"
}
}
+ enabled: true
}
feature {
name: "xcode_5.0"
@@ -887,6 +889,7 @@
expand_if_all_available: "dependency_file"
}
}
+ enabled: true
}
feature {
name: "random_seed"
@@ -900,6 +903,7 @@
expand_if_all_available: "output_file"
}
}
+ enabled: true
}
feature {
name: "pic"
@@ -914,6 +918,7 @@
expand_if_all_available: "pic"
}
}
+ enabled: true
}
feature {
name: "per_object_debug_info"
@@ -976,6 +981,7 @@
iterate_over: "system_include_paths"
}
}
+ enabled: true
}
feature {
name: "fdo_instrument"
@@ -2349,6 +2355,7 @@
}
feature {
name: "module_maps"
+ enabled: true
}
feature {
name: "use_objc_modules"
@@ -2413,6 +2420,7 @@
iterate_over: "preprocessor_defines"
}
}
+ enabled: true
}
feature {
name: "xcode_5.0"
@@ -2666,6 +2674,7 @@
expand_if_all_available: "dependency_file"
}
}
+ enabled: true
}
feature {
name: "random_seed"
@@ -2679,6 +2688,7 @@
expand_if_all_available: "output_file"
}
}
+ enabled: true
}
feature {
name: "pic"
@@ -2693,6 +2703,7 @@
expand_if_all_available: "pic"
}
}
+ enabled: true
}
feature {
name: "per_object_debug_info"
@@ -2755,6 +2766,7 @@
iterate_over: "system_include_paths"
}
}
+ enabled: true
}
feature {
name: "fdo_instrument"
@@ -4135,6 +4147,7 @@
}
feature {
name: "module_maps"
+ enabled: true
}
feature {
name: "use_objc_modules"
@@ -4199,6 +4212,7 @@
iterate_over: "preprocessor_defines"
}
}
+ enabled: true
}
feature {
name: "xcode_5.0"
@@ -4454,6 +4468,7 @@
expand_if_all_available: "dependency_file"
}
}
+ enabled: true
}
feature {
name: "random_seed"
@@ -4467,6 +4482,7 @@
expand_if_all_available: "output_file"
}
}
+ enabled: true
}
feature {
name: "pic"
@@ -4481,6 +4497,7 @@
expand_if_all_available: "pic"
}
}
+ enabled: true
}
feature {
name: "per_object_debug_info"
@@ -4543,6 +4560,7 @@
iterate_over: "system_include_paths"
}
}
+ enabled: true
}
feature {
name: "fdo_instrument"
@@ -5937,6 +5955,7 @@
}
feature {
name: "module_maps"
+ enabled: true
}
feature {
name: "use_objc_modules"
@@ -6001,6 +6020,7 @@
iterate_over: "preprocessor_defines"
}
}
+ enabled: true
}
feature {
name: "xcode_5.0"
@@ -6258,6 +6278,7 @@
expand_if_all_available: "dependency_file"
}
}
+ enabled: true
}
feature {
name: "random_seed"
@@ -6271,6 +6292,7 @@
expand_if_all_available: "output_file"
}
}
+ enabled: true
}
feature {
name: "pic"
@@ -6285,6 +6307,7 @@
expand_if_all_available: "pic"
}
}
+ enabled: true
}
feature {
name: "per_object_debug_info"
@@ -6347,6 +6370,7 @@
iterate_over: "system_include_paths"
}
}
+ enabled: true
}
feature {
name: "fdo_instrument"
@@ -7742,6 +7766,7 @@
}
feature {
name: "module_maps"
+ enabled: true
}
feature {
name: "use_objc_modules"
@@ -7806,6 +7831,7 @@
iterate_over: "preprocessor_defines"
}
}
+ enabled: true
}
feature {
name: "xcode_5.0"
@@ -8061,6 +8087,7 @@
expand_if_all_available: "dependency_file"
}
}
+ enabled: true
}
feature {
name: "random_seed"
@@ -8074,6 +8101,7 @@
expand_if_all_available: "output_file"
}
}
+ enabled: true
}
feature {
name: "pic"
@@ -8088,6 +8116,7 @@
expand_if_all_available: "pic"
}
}
+ enabled: true
}
feature {
name: "per_object_debug_info"
@@ -8150,6 +8179,7 @@
iterate_over: "system_include_paths"
}
}
+ enabled: true
}
feature {
name: "fdo_instrument"
@@ -9574,6 +9604,7 @@
}
feature {
name: "module_maps"
+ enabled: true
}
feature {
name: "use_objc_modules"
@@ -9638,6 +9669,7 @@
iterate_over: "preprocessor_defines"
}
}
+ enabled: true
}
feature {
name: "xcode_5.0"
@@ -9893,6 +9925,7 @@
expand_if_all_available: "dependency_file"
}
}
+ enabled: true
}
feature {
name: "random_seed"
@@ -9906,6 +9939,7 @@
expand_if_all_available: "output_file"
}
}
+ enabled: true
}
feature {
name: "pic"
@@ -9920,6 +9954,7 @@
expand_if_all_available: "pic"
}
}
+ enabled: true
}
feature {
name: "per_object_debug_info"
@@ -9982,6 +10017,7 @@
iterate_over: "system_include_paths"
}
}
+ enabled: true
}
feature {
name: "fdo_instrument"
@@ -11376,6 +11412,7 @@
}
feature {
name: "module_maps"
+ enabled: true
}
feature {
name: "use_objc_modules"
@@ -11440,6 +11477,7 @@
iterate_over: "preprocessor_defines"
}
}
+ enabled: true
}
feature {
name: "xcode_5.0"
@@ -11695,6 +11733,7 @@
expand_if_all_available: "dependency_file"
}
}
+ enabled: true
}
feature {
name: "random_seed"
@@ -11708,6 +11747,7 @@
expand_if_all_available: "output_file"
}
}
+ enabled: true
}
feature {
name: "pic"
@@ -11722,6 +11762,7 @@
expand_if_all_available: "pic"
}
}
+ enabled: true
}
feature {
name: "per_object_debug_info"
@@ -11784,6 +11825,7 @@
iterate_over: "system_include_paths"
}
}
+ enabled: true
}
feature {
name: "fdo_instrument"
@@ -13198,6 +13240,7 @@
}
feature {
name: "module_maps"
+ enabled: true
}
feature {
name: "use_objc_modules"
@@ -13262,6 +13305,7 @@
iterate_over: "preprocessor_defines"
}
}
+ enabled: true
}
feature {
name: "xcode_5.0"
@@ -13519,6 +13563,7 @@
expand_if_all_available: "dependency_file"
}
}
+ enabled: true
}
feature {
name: "random_seed"
@@ -13532,6 +13577,7 @@
expand_if_all_available: "output_file"
}
}
+ enabled: true
}
feature {
name: "pic"
@@ -13546,6 +13592,7 @@
expand_if_all_available: "pic"
}
}
+ enabled: true
}
feature {
name: "per_object_debug_info"
@@ -13608,6 +13655,7 @@
iterate_over: "system_include_paths"
}
}
+ enabled: true
}
feature {
name: "fdo_instrument"
@@ -15023,6 +15071,7 @@
}
feature {
name: "module_maps"
+ enabled: true
}
feature {
name: "use_objc_modules"
@@ -15087,6 +15136,7 @@
iterate_over: "preprocessor_defines"
}
}
+ enabled: true
}
feature {
name: "xcode_5.0"
@@ -15342,6 +15392,7 @@
expand_if_all_available: "dependency_file"
}
}
+ enabled: true
}
feature {
name: "random_seed"
@@ -15355,6 +15406,7 @@
expand_if_all_available: "output_file"
}
}
+ enabled: true
}
feature {
name: "pic"
@@ -15369,6 +15421,7 @@
expand_if_all_available: "pic"
}
}
+ enabled: true
}
feature {
name: "per_object_debug_info"
@@ -15431,6 +15484,7 @@
iterate_over: "system_include_paths"
}
}
+ enabled: true
}
feature {
name: "fdo_instrument"
@@ -16875,6 +16929,7 @@
}
feature {
name: "module_maps"
+ enabled: true
}
feature {
name: "use_objc_modules"
@@ -16939,6 +16994,7 @@
iterate_over: "preprocessor_defines"
}
}
+ enabled: true
}
feature {
name: "xcode_5.0"
@@ -17194,6 +17250,7 @@
expand_if_all_available: "dependency_file"
}
}
+ enabled: true
}
feature {
name: "random_seed"
@@ -17207,6 +17264,7 @@
expand_if_all_available: "output_file"
}
}
+ enabled: true
}
feature {
name: "pic"
@@ -17221,6 +17279,7 @@
expand_if_all_available: "pic"
}
}
+ enabled: true
}
feature {
name: "per_object_debug_info"
@@ -17283,6 +17342,7 @@
iterate_over: "system_include_paths"
}
}
+ enabled: true
}
feature {
name: "fdo_instrument"
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
index b8b7e1b..b868085 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
@@ -469,6 +469,23 @@
+ " extension: '.a'"
+ "}";
+ public static final String MODULE_MAPS_FEATURE =
+ ""
+ + "feature {"
+ + " name: 'module_maps'"
+ + " enabled: true"
+ + " flag_set {"
+ + " action: 'c-compile'"
+ + " action: 'c++-compile'"
+ + " action: 'c++-header-parsing'"
+ + " action: 'c++-module-compile'"
+ + " flag_group {"
+ + " flag: 'module_name:%{module_name}'"
+ + " flag: 'module_map_file:%{module_map_file}'"
+ + " }"
+ + " }"
+ + "}";
+
public static final String EMPTY_COMPILE_ACTION_CONFIG =
emptyActionConfigFor(CppActionNames.CPP_COMPILE);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
index f1dc565..bccc6fd 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
@@ -719,7 +719,7 @@
mockToolsConfig,
MockCcSupport.SUPPORTS_PIC_FEATURE,
"feature { name: 'header_modules' implies: 'use_header_modules' }",
- "feature { name: 'module_maps' enabled: true }",
+ MockCcSupport.MODULE_MAPS_FEATURE,
"feature { name: 'use_header_modules' }");
useConfiguration("--cpu=k8");
scratch.file("module/BUILD",
@@ -1033,7 +1033,7 @@
public void testCppModuleMap() throws Exception {
AnalysisMock.get()
.ccSupport()
- .setupCrosstool(mockToolsConfig, "feature { name: 'module_maps' enabled: true }");
+ .setupCrosstool(mockToolsConfig, MockCcSupport.MODULE_MAPS_FEATURE);
useConfiguration();
writeSimpleCcLibrary();
CppModuleMapAction action = getCppModuleMapAction("//module:map");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java
index 26211cd..20f425a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java
@@ -226,7 +226,7 @@
" }",
"}",
MockCcSupport.PER_OBJECT_DEBUG_INFO_CONFIGURATION,
- "supports_start_end_lib: true",
+ MockCcSupport.SUPPORTS_START_END_LIB_FEATURE,
MockCcSupport.THIN_LTO_CONFIGURATION,
MockCcSupport.HOST_AND_NONHOST_CONFIGURATION);
useConfiguration("--fission=yes", "--features=thin_lto");
diff --git a/tools/cpp/cc_toolchain_config.bzl b/tools/cpp/cc_toolchain_config.bzl
index f043a28..22d67d4 100644
--- a/tools/cpp/cc_toolchain_config.bzl
+++ b/tools/cpp/cc_toolchain_config.bzl
@@ -285,7 +285,7 @@
else:
fail("Unreachable")
- random_seed_feature = feature(name = "random_seed")
+ random_seed_feature = feature(name = "random_seed", enabled = True)
compiler_output_flags_feature = feature(
name = "compiler_output_flags",
@@ -1060,6 +1060,7 @@
include_paths_feature = feature(
name = "include_paths",
+ enabled = True,
flag_sets = [
flag_set(
actions = [
@@ -1089,6 +1090,7 @@
dependency_file_feature = feature(
name = "dependency_file",
+ enabled = True,
flag_sets = [
flag_set(
actions = [
diff --git a/tools/cpp/cc_toolchain_config.bzl.tpl b/tools/cpp/cc_toolchain_config.bzl.tpl
index c1d085e..9e747ec 100644
--- a/tools/cpp/cc_toolchain_config.bzl.tpl
+++ b/tools/cpp/cc_toolchain_config.bzl.tpl
@@ -600,6 +600,7 @@
preprocessor_defines_feature = feature(
name = "preprocessor_defines",
+ enabled = True,
flag_sets = [
flag_set(
actions = [
@@ -758,6 +759,7 @@
include_paths_feature = feature(
name = "include_paths",
+ enabled = True,
flag_sets = [
flag_set(
actions = [
diff --git a/tools/osx/crosstool/cc_toolchain_config.bzl.tpl b/tools/osx/crosstool/cc_toolchain_config.bzl.tpl
index 81bdaac..bc6d49b 100644
--- a/tools/osx/crosstool/cc_toolchain_config.bzl.tpl
+++ b/tools/osx/crosstool/cc_toolchain_config.bzl.tpl
@@ -3581,6 +3581,7 @@
pic_feature = feature(
name = "pic",
+ enabled = True,
flag_sets = [
flag_set(
actions = [
@@ -4243,6 +4244,7 @@
random_seed_feature = feature(
name = "random_seed",
+ enabled = True,
flag_sets = [
flag_set(
actions = [
@@ -4391,7 +4393,7 @@
],
)
- module_maps_feature = feature(name = "module_maps")
+ module_maps_feature = feature(name = "module_maps", enabled = True)
if (ctx.attr.cpu == "ios_arm64"):
unfiltered_compile_flags_feature = feature(
@@ -4877,6 +4879,7 @@
include_paths_feature = feature(
name = "include_paths",
+ enabled = True,
flag_sets = [
flag_set(
actions = [
@@ -5269,6 +5272,7 @@
dependency_file_feature = feature(
name = "dependency_file",
+ enabled = True,
flag_sets = [
flag_set(
actions = [
@@ -5293,6 +5297,7 @@
preprocessor_defines_feature = feature(
name = "preprocessor_defines",
+ enabled = True,
flag_sets = [
flag_set(
actions = [
