diff options
| author |  hlopko <hlopko@google.com> | 2018-06-26 09:47:04 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-26 09:49:05 -0700 |
| commit | 26aaea260d970e2022a7bdc911a01aa3679e0f3a (patch) | |
| tree | 534cdbf053c8855b6c712dfbf82e9ec43dc2b4c9 | |
| parent | 15dab1879bd1b1245429e33804de39ab314ec026 (diff) | |
Remove support for header preprocessing
This was never used. We thought it will be useful, but it's not.
RELNOTES: None.
PiperOrigin-RevId: 202143524
15 files changed, 10 insertions, 436 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java index 1ddb027b6c..451d40020c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java @@ -115,7 +115,6 @@ public final class CcCommon { CppActionNames.C_COMPILE, CppActionNames.CPP_COMPILE, CppActionNames.CPP_HEADER_PARSING, - CppActionNames.CPP_HEADER_PREPROCESSING, CppActionNames.CPP_MODULE_COMPILE, CppActionNames.CPP_MODULE_CODEGEN, CppActionNames.ASSEMBLE, @@ -829,7 +828,6 @@ public final class CcCommon { // TODO(bazel-team): Remove once supports_header_parsing has been removed from the // cc_toolchain rule. unsupportedFeaturesBuilder.add(CppRuleClasses.PARSE_HEADERS); - unsupportedFeaturesBuilder.add(CppRuleClasses.PREPROCESS_HEADERS); } if (toolchain.getCcCompilationInfo().getCcCompilationContext().getCppModuleMap() == null) { unsupportedFeaturesBuilder.add(CppRuleClasses.MODULE_MAPS); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java index f8cd4d6b46..b20c61a632 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java @@ -293,8 +293,7 @@ public final class CcToolchainProvider extends ToolchainInfo implements CcToolch // If parse_headers_verifies_modules is switched on, we verify that headers are // self-contained by building the module instead. return !cppConfiguration.getParseHeadersVerifiesModules() - && (featureConfiguration.isEnabled(CppRuleClasses.PREPROCESS_HEADERS) - || featureConfiguration.isEnabled(CppRuleClasses.PARSE_HEADERS)); + && featureConfiguration.isEnabled(CppRuleClasses.PARSE_HEADERS); } /** 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 e933ae382c..f030f7cbbf 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 @@ -142,19 +142,6 @@ public class CppActionConfigs { " implies: 'compiler_output_flags'", "}", "action_config {", - " config_name: 'c++-header-preprocessing'", - " action_name: 'c++-header-preprocessing'", - " tool {", - " tool_path: '" + gccToolPath + "'", - " }", - " implies: 'legacy_compile_flags'", - " implies: 'user_compile_flags'", - " implies: 'sysroot'", - " implies: 'unfiltered_compile_flags'", - " implies: 'compiler_input_flags'", - " implies: 'compiler_output_flags'", - "}", - "action_config {", " config_name: 'c++-module-compile'", " action_name: 'c++-module-compile'", " tool {", @@ -193,7 +180,6 @@ public class CppActionConfigs { " action: 'c-compile'", " action: 'c++-compile'", " action: 'c++-header-parsing'", - " action: 'c++-header-preprocessing'", " action: 'c++-module-compile'", " action: 'c++-module-codegen'", " action: 'lto-backend'", @@ -230,7 +216,6 @@ public class CppActionConfigs { " action: 'c++-module-compile'", " action: 'objc-compile'", " action: 'objc++-compile'", - " action: 'c++-header-preprocessing'", " action: 'c++-header-parsing'", " action: 'clif-match'", " expand_if_all_available: 'dependency_file'", @@ -305,7 +290,6 @@ public class CppActionConfigs { " action: 'c-compile'", " action: 'c++-compile'", " action: 'c++-header-parsing'", - " action: 'c++-header-preprocessing'", " action: 'c++-module-compile'", " action: 'clif-match'", " flag_group {", @@ -325,7 +309,6 @@ public class CppActionConfigs { " action: 'c-compile'", " action: 'c++-compile'", " action: 'c++-header-parsing'", - " action: 'c++-header-preprocessing'", " action: 'c++-module-compile'", " action: 'clif-match'", " action: 'objc-compile'", @@ -348,7 +331,6 @@ public class CppActionConfigs { " action: 'c-compile'", " action: 'c++-compile'", " action: 'c++-header-parsing'", - " action: 'c++-header-preprocessing'", " action: 'c++-module-compile'", " action: 'clif-match'", " action: 'objc-compile'", @@ -1052,7 +1034,6 @@ public class CppActionConfigs { " action: 'c-compile'", " action: 'c++-compile'", " action: 'c++-header-parsing'", - " action: 'c++-header-preprocessing'", " action: 'c++-module-compile'", " action: 'c++-module-codegen'", " action: 'lto-backend'", @@ -1074,7 +1055,6 @@ public class CppActionConfigs { " action: 'c-compile'", " action: 'c++-compile'", " action: 'c++-header-parsing'", - " action: 'c++-header-preprocessing'", " action: 'c++-module-compile'", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", @@ -1104,7 +1084,6 @@ public class CppActionConfigs { " action: 'c-compile'", " action: 'c++-compile'", " action: 'c++-header-parsing'", - " action: 'c++-header-preprocessing'", " action: 'c++-module-compile'", " action: 'c++-module-codegen'", " action: 'lto-backend'", @@ -1151,7 +1130,6 @@ public class CppActionConfigs { " action: 'c++-module-codegen'", " action: 'objc-compile'", " action: 'objc++-compile'", - " action: 'c++-header-preprocessing'", " action: 'c++-header-parsing'", " action: 'lto-backend'", " expand_if_all_available: 'source_file'", @@ -1176,7 +1154,6 @@ public class CppActionConfigs { " action: 'c++-module-codegen'", " action: 'objc-compile'", " action: 'objc++-compile'", - " action: 'c++-header-preprocessing'", " action: 'c++-header-parsing'", " action: 'lto-backend'", " flag_group {", diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionNames.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionNames.java index 1f2c749a5a..6547219ff2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionNames.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionNames.java @@ -34,8 +34,6 @@ public class CppActionNames { public static final String OBJCPP_COMPILE = "objc++-compile"; /** A string constant for the c++ header parsing. */ public static final String CPP_HEADER_PARSING = "c++-header-parsing"; - /** A string constant for the c++ header preprocessing. */ - public static final String CPP_HEADER_PREPROCESSING = "c++-header-preprocessing"; /** * A string constant for the c++ module compilation action. Note: currently we don't support C * module compilation. diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java index 994e8ba999..b2be52f504 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java @@ -193,13 +193,9 @@ public class CppCompileActionBuilder { if (!cppConfiguration.getParseHeadersVerifiesModules() && featureConfiguration.isEnabled(CppRuleClasses.PARSE_HEADERS)) { return CppActionNames.CPP_HEADER_PARSING; - } else if (!cppConfiguration.getParseHeadersVerifiesModules() - && featureConfiguration.isEnabled(CppRuleClasses.PREPROCESS_HEADERS)) { - return CppActionNames.CPP_HEADER_PREPROCESSING; } else { // CcCommon.collectCAndCppSources() ensures we do not add headers to - // the compilation artifacts unless either 'parse_headers' or - // 'preprocess_headers' is set. + // the compilation artifacts unless 'parse_headers' is set. throw new IllegalStateException(); } } else if (CppFileTypes.C_SOURCE.matches(sourcePath)) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java index fc62f040b7..3cb9f29ea9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java @@ -122,11 +122,6 @@ public class CppRuleClasses { public static final String PARSE_HEADERS = "parse_headers"; /** - * A string constant for the preprocess_headers feature. - */ - public static final String PREPROCESS_HEADERS = "preprocess_headers"; - - /** * A string constant for the module_maps feature; this is a precondition to the layering_check and * header_modules features. */ 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 6e22abb3fc..6fda1b5c93 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 @@ -80,10 +80,8 @@ public abstract class MockCcSupport { + " }" + "}"; - /** - * A feature configuration snippet useful for testing header processing. - */ - public static final String HEADER_PROCESSING_FEATURE_CONFIGURATION = + /** A feature configuration snippet useful for testing header processing. */ + public static final String PARSE_HEADERS_FEATURE_CONFIGURATION = "" + "feature {" + " name: 'parse_headers'" @@ -93,15 +91,6 @@ public abstract class MockCcSupport { + " flag: '<c++-header-parsing>'" + " }" + " }" - + "}" - + "feature {" - + " name: 'preprocess_headers'" - + " flag_set {" - + " action: 'c++-header-preprocessing'" - + " flag_group {" - + " flag: '<c++-header-preprocessing>'" - + " }" - + " }" + "}"; /** A feature configuration snippet useful for testing the layering check. */ 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 9505f052ff..0ceaee87c0 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 @@ -1078,7 +1078,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testDoNotCompileSourceFilesInHeaders() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers"); ConfiguredTarget x = scratchConfiguredTarget("x", "x", "cc_library(name = 'x', hdrs = ['x.cc'])"); @@ -1089,7 +1089,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testProcessHeadersInDependencies() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers", "--process_headers_in_dependencies"); ConfiguredTarget x = scratchConfiguredTarget( @@ -1105,7 +1105,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testProcessHeadersInDependenciesOfBinaries() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers", "--process_headers_in_dependencies"); ConfiguredTarget x = scratchConfiguredTarget( @@ -1124,7 +1124,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testDoNotProcessHeadersInDependencies() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers"); ConfiguredTarget x = scratchConfiguredTarget( @@ -1140,7 +1140,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testProcessHeadersInCompileOnlyMode() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers", "--process_headers_in_dependencies"); ConfiguredTarget y = scratchConfiguredTarget( @@ -1497,8 +1497,7 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { public void testProcessedHeadersWithPicSharedLibsAndNoPicBinaries() throws Exception { AnalysisMock.get() .ccSupport() - .setupCrosstool(mockToolsConfig, - MockCcSupport.HEADER_PROCESSING_FEATURE_CONFIGURATION); + .setupCrosstool(mockToolsConfig, MockCcSupport.PARSE_HEADERS_FEATURE_CONFIGURATION); useConfiguration("--features=parse_headers", "-c", "opt"); // Should not crash scratchConfiguredTarget("a", "a", "cc_library(name='a', hdrs=['a.h'])"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java index 1dffb0f870..37f32f1316 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java @@ -60,7 +60,6 @@ public class CompileCommandLineTest extends BuildViewTestCase { CppActionNames.C_COMPILE, CppActionNames.CPP_COMPILE, CppActionNames.CPP_HEADER_PARSING, - CppActionNames.CPP_HEADER_PREPROCESSING, CppActionNames.CPP_MODULE_CODEGEN, CppActionNames.CPP_MODULE_COMPILE)); } diff --git a/tools/build_defs/cc/action_names.bzl b/tools/build_defs/cc/action_names.bzl index 53061c48d3..4f1e34298e 100644 --- a/tools/build_defs/cc/action_names.bzl +++ b/tools/build_defs/cc/action_names.bzl @@ -31,9 +31,6 @@ CPP_MODULE_CODEGEN_ACTION_NAME = "c++-module-codegen" # Name of the C++ header parsing action. CPP_HEADER_PARSING_ACTION_NAME = "c++-header-parsing" -# Name of the C++ header preprocessing action. -CPP_HEADER_PREPROCESSING_ACTION_NAME = "c++-header-preprocessing" - # Name of the C++ module compile action. CPP_MODULE_COMPILE_ACTION_NAME = "c++-module-compile" diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL index 29a71a1066..3f7f6a0d8e 100644 --- a/tools/cpp/CROSSTOOL +++ b/tools/cpp/CROSSTOOL @@ -712,7 +712,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' flag_group { @@ -729,7 +728,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' flag_group { iterate_over: 'quote_include_paths' @@ -754,7 +752,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-module-compile' - action: 'c++-header-preprocessing' action: 'c++-header-parsing' expand_if_all_available: 'dependency_file' flag_group { @@ -773,7 +770,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' flag_group { @@ -792,7 +788,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' action: 'c++-link-executable' @@ -814,7 +809,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' flag_group { @@ -841,7 +835,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' flag_group { @@ -872,7 +865,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' flag_group { diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl index 02ff6617c9..dd981059ed 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -330,7 +330,6 @@ toolchain { action: "c++-module-compile" action: "c++-module-codegen" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "c++-link-executable" @@ -496,7 +495,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' flag_group { @@ -514,7 +512,6 @@ toolchain { action: "c++-module-compile" action: "c++-module-codegen" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "c++-link-executable" @@ -565,7 +562,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' flag_group { iterate_over: 'quote_include_paths' @@ -590,7 +586,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" flag_group { flag: "/D%{preprocessor_defines}" @@ -607,7 +602,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-module-compile' - action: 'c++-header-preprocessing' action: 'c++-header-parsing' flag_group { flag: "/showIncludes" @@ -997,7 +991,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' flag_group { @@ -1016,7 +1009,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' action: 'c++-link-executable' @@ -1037,7 +1029,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' flag_group { @@ -1064,7 +1055,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' flag_group { @@ -1095,7 +1085,6 @@ toolchain { action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' action: 'c++-module-codegen' flag_group { diff --git a/tools/cpp/crosstool_utils.bzl b/tools/cpp/crosstool_utils.bzl index 8ddeb86259..e3af7c501e 100644 --- a/tools/cpp/crosstool_utils.bzl +++ b/tools/cpp/crosstool_utils.bzl @@ -19,7 +19,6 @@ COMPILE_ACTIONS = [ "c-compile", "c++-compile", "c++-header-parsing", - "c++-header-preprocessing", "c++-module-compile", "c++-module-codegen", "assemble", diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl index 3141b0bc25..6600c8ea8d 100644 --- a/tools/cpp/unix_cc_configure.bzl +++ b/tools/cpp/unix_cc_configure.bzl @@ -419,7 +419,6 @@ def _coverage_feature(repository_ctx, darwin): action: 'c-compile' action: 'c++-compile' action: 'c++-header-parsing' - action: 'c++-header-preprocessing' action: 'c++-module-compile' """ + compile_flags + """ } diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl index a9338fdb7b..e065efbff8 100644 --- a/tools/osx/crosstool/CROSSTOOL.tpl +++ b/tools/osx/crosstool/CROSSTOOL.tpl @@ -189,7 +189,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -599,7 +598,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -620,7 +618,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "clif-match" @@ -652,7 +649,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" @@ -675,7 +671,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" flag_group { flag: "-MD" @@ -732,7 +727,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "objc-compile" @@ -895,7 +889,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "objc-compile" action: "objc++-compile" action: "objc-executable" @@ -921,7 +914,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -939,7 +931,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -957,7 +948,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -1027,7 +1017,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -1091,7 +1080,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -1112,7 +1100,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -1153,7 +1140,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -1174,7 +1160,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -1316,26 +1301,6 @@ toolchain { implies: "compiler_output_flags" } action_config { - config_name: "c++-header-preprocessing" - action_name: "c++-header-preprocessing" - tool { - tool_path: "wrapped_clang" - execution_requirement: "requires-darwin" - } - implies: "preprocessor_defines" - implies: "include_system_dirs" - implies: "version_min" - implies: "objc_arc" - implies: "no_objc_arc" - implies: "apple_env" - implies: "legacy_compile_flags" - implies: "user_compile_flags" - implies: "sysroot" - implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" - } - action_config { config_name: "objc-compile" action_name: "objc-compile" tool { @@ -1841,7 +1806,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -2260,7 +2224,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -2281,7 +2244,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "clif-match" @@ -2313,7 +2275,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" @@ -2336,7 +2297,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" flag_group { flag: "-MD" @@ -2393,7 +2353,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "objc-compile" @@ -2556,7 +2515,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "objc-compile" action: "objc++-compile" action: "objc-executable" @@ -2582,7 +2540,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -2600,7 +2557,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -2618,7 +2574,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -2688,7 +2643,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -2757,7 +2711,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -2778,7 +2731,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -2819,7 +2771,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -2840,7 +2791,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -2982,26 +2932,6 @@ toolchain { implies: "compiler_output_flags" } action_config { - config_name: "c++-header-preprocessing" - action_name: "c++-header-preprocessing" - tool { - tool_path: "wrapped_clang" - execution_requirement: "requires-darwin" - } - implies: "preprocessor_defines" - implies: "include_system_dirs" - implies: "version_min" - implies: "objc_arc" - implies: "no_objc_arc" - implies: "apple_env" - implies: "legacy_compile_flags" - implies: "user_compile_flags" - implies: "sysroot" - implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" - } - action_config { config_name: "objc-compile" action_name: "objc-compile" tool { @@ -3509,7 +3439,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -3928,7 +3857,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -3949,7 +3877,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "clif-match" @@ -3981,7 +3908,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" @@ -4004,7 +3930,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" flag_group { flag: "-MD" @@ -4061,7 +3986,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "objc-compile" @@ -4224,7 +4148,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "objc-compile" action: "objc++-compile" action: "objc-executable" @@ -4252,7 +4175,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -4270,7 +4192,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -4288,7 +4209,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -4358,7 +4278,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -4427,7 +4346,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -4448,7 +4366,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -4489,7 +4406,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -4510,7 +4426,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -4652,26 +4567,6 @@ toolchain { implies: "compiler_output_flags" } action_config { - config_name: "c++-header-preprocessing" - action_name: "c++-header-preprocessing" - tool { - tool_path: "wrapped_clang" - execution_requirement: "requires-darwin" - } - implies: "preprocessor_defines" - implies: "include_system_dirs" - implies: "version_min" - implies: "objc_arc" - implies: "no_objc_arc" - implies: "apple_env" - implies: "legacy_compile_flags" - implies: "user_compile_flags" - implies: "sysroot" - implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" - } - action_config { config_name: "objc-compile" action_name: "objc-compile" tool { @@ -5180,7 +5075,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -5599,7 +5493,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -5620,7 +5513,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "clif-match" @@ -5652,7 +5544,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" @@ -5675,7 +5566,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" flag_group { flag: "-MD" @@ -5732,7 +5622,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "objc-compile" @@ -5895,7 +5784,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "objc-compile" action: "objc++-compile" action: "objc-executable" @@ -5921,7 +5809,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -5939,7 +5826,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -5957,7 +5843,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -6027,7 +5912,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -6117,7 +6001,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -6138,7 +6021,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -6179,7 +6061,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -6200,7 +6081,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -6346,27 +6226,6 @@ toolchain { implies: "unfiltered_cxx_flags" } action_config { - config_name: "c++-header-preprocessing" - action_name: "c++-header-preprocessing" - tool { - tool_path: "wrapped_clang" - execution_requirement: "requires-darwin" - } - implies: "preprocessor_defines" - implies: "include_system_dirs" - implies: "version_min" - implies: "objc_arc" - implies: "no_objc_arc" - implies: "apple_env" - implies: "legacy_compile_flags" - implies: "user_compile_flags" - implies: "sysroot" - implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" - implies: "unfiltered_cxx_flags" - } - action_config { config_name: "objc-compile" action_name: "objc-compile" tool { @@ -6879,7 +6738,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -7298,7 +7156,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -7319,7 +7176,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "clif-match" @@ -7351,7 +7207,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" @@ -7374,7 +7229,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" flag_group { flag: "-MD" @@ -7431,7 +7285,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "objc-compile" @@ -7594,7 +7447,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "objc-compile" action: "objc++-compile" action: "objc-executable" @@ -7620,7 +7472,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -7638,7 +7489,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -7656,7 +7506,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -7726,7 +7575,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -7795,7 +7643,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -7816,7 +7663,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -7857,7 +7703,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -7878,7 +7723,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -8020,26 +7864,6 @@ toolchain { implies: "compiler_output_flags" } action_config { - config_name: "c++-header-preprocessing" - action_name: "c++-header-preprocessing" - tool { - tool_path: "wrapped_clang" - execution_requirement: "requires-darwin" - } - implies: "preprocessor_defines" - implies: "include_system_dirs" - implies: "version_min" - implies: "objc_arc" - implies: "no_objc_arc" - implies: "apple_env" - implies: "legacy_compile_flags" - implies: "user_compile_flags" - implies: "sysroot" - implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" - } - action_config { config_name: "objc-compile" action_name: "objc-compile" tool { @@ -8547,7 +8371,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -8966,7 +8789,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -8987,7 +8809,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "clif-match" @@ -9019,7 +8840,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" @@ -9042,7 +8862,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" flag_group { flag: "-MD" @@ -9099,7 +8918,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "objc-compile" @@ -9262,7 +9080,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "objc-compile" action: "objc++-compile" action: "objc-executable" @@ -9288,7 +9105,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -9306,7 +9122,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -9324,7 +9139,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -9394,7 +9208,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -9453,7 +9266,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -9474,7 +9286,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -9515,7 +9326,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -9536,7 +9346,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -9678,26 +9487,6 @@ toolchain { implies: "compiler_output_flags" } action_config { - config_name: "c++-header-preprocessing" - action_name: "c++-header-preprocessing" - tool { - tool_path: "wrapped_clang" - execution_requirement: "requires-darwin" - } - implies: "preprocessor_defines" - implies: "include_system_dirs" - implies: "version_min" - implies: "objc_arc" - implies: "no_objc_arc" - implies: "apple_env" - implies: "legacy_compile_flags" - implies: "user_compile_flags" - implies: "sysroot" - implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" - } - action_config { config_name: "objc-compile" action_name: "objc-compile" tool { @@ -10203,7 +9992,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -10622,7 +10410,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -10643,7 +10430,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "clif-match" @@ -10675,7 +10461,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" @@ -10698,7 +10483,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" flag_group { flag: "-MD" @@ -10755,7 +10539,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "objc-compile" @@ -10918,7 +10701,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "objc-compile" action: "objc++-compile" action: "objc-executable" @@ -10946,7 +10728,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -10964,7 +10745,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -10982,7 +10762,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -11052,7 +10831,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -11111,7 +10889,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -11132,7 +10909,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -11173,7 +10949,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -11194,7 +10969,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -11336,26 +11110,6 @@ toolchain { implies: "compiler_output_flags" } action_config { - config_name: "c++-header-preprocessing" - action_name: "c++-header-preprocessing" - tool { - tool_path: "wrapped_clang" - execution_requirement: "requires-darwin" - } - implies: "preprocessor_defines" - implies: "include_system_dirs" - implies: "version_min" - implies: "objc_arc" - implies: "no_objc_arc" - implies: "apple_env" - implies: "legacy_compile_flags" - implies: "user_compile_flags" - implies: "sysroot" - implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" - } - action_config { config_name: "objc-compile" action_name: "objc-compile" tool { @@ -11862,7 +11616,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -12281,7 +12034,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -12302,7 +12054,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "clif-match" @@ -12334,7 +12085,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" @@ -12357,7 +12107,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" flag_group { flag: "-MD" @@ -12414,7 +12163,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "objc-compile" @@ -12577,7 +12325,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "objc-compile" action: "objc++-compile" action: "objc-executable" @@ -12603,7 +12350,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -12621,7 +12367,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -12639,7 +12384,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -12709,7 +12453,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -12789,7 +12532,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -12810,7 +12552,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -12851,7 +12592,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -12872,7 +12612,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -13018,27 +12757,6 @@ toolchain { implies: "unfiltered_cxx_flags" } action_config { - config_name: "c++-header-preprocessing" - action_name: "c++-header-preprocessing" - tool { - tool_path: "wrapped_clang" - execution_requirement: "requires-darwin" - } - implies: "preprocessor_defines" - implies: "include_system_dirs" - implies: "version_min" - implies: "objc_arc" - implies: "no_objc_arc" - implies: "apple_env" - implies: "legacy_compile_flags" - implies: "user_compile_flags" - implies: "sysroot" - implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" - implies: "unfiltered_cxx_flags" - } - action_config { config_name: "objc-compile" action_name: "objc-compile" tool { @@ -13549,7 +13267,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -13968,7 +13685,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -13989,7 +13705,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "clif-match" @@ -14021,7 +13736,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" @@ -14044,7 +13758,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" flag_group { flag: "-MD" @@ -14101,7 +13814,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "objc-compile" @@ -14264,7 +13976,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "objc-compile" action: "objc++-compile" action: "objc-executable" @@ -14290,7 +14001,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -14308,7 +14018,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -14326,7 +14035,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -14396,7 +14104,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -14455,7 +14162,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -14476,7 +14182,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -14517,7 +14222,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -14538,7 +14242,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -14680,26 +14383,6 @@ toolchain { implies: "compiler_output_flags" } action_config { - config_name: "c++-header-preprocessing" - action_name: "c++-header-preprocessing" - tool { - tool_path: "wrapped_clang" - execution_requirement: "requires-darwin" - } - implies: "preprocessor_defines" - implies: "include_system_dirs" - implies: "version_min" - implies: "objc_arc" - implies: "no_objc_arc" - implies: "apple_env" - implies: "legacy_compile_flags" - implies: "user_compile_flags" - implies: "sysroot" - implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" - } - action_config { config_name: "objc-compile" action_name: "objc-compile" tool { @@ -15206,7 +14889,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -15625,7 +15307,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -15646,7 +15327,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "clif-match" @@ -15678,7 +15358,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" action: "c++-link-executable" action: "c++-link-dynamic-library" @@ -15701,7 +15380,6 @@ toolchain { action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" - action: "c++-header-preprocessing" action: "c++-header-parsing" flag_group { flag: "-MD" @@ -15758,7 +15436,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "linkstamp-compile" action: "objc-compile" @@ -15921,7 +15598,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "objc-compile" action: "objc++-compile" action: "objc-executable" @@ -15947,7 +15623,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -15965,7 +15640,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -15983,7 +15657,6 @@ toolchain { action: "c++-compile" action: "c++-module-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "assemble" action: "preprocess-assemble" action: "objc-compile" @@ -16053,7 +15726,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "objc-compile" action: "objc++-compile" @@ -16112,7 +15784,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -16133,7 +15804,6 @@ toolchain { action: "c-compile" action: "c++-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "linkstamp-compile" @@ -16174,7 +15844,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -16195,7 +15864,6 @@ toolchain { action: "c++-compile" action: "linkstamp-compile" action: "c++-header-parsing" - action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" action: "objc-compile" @@ -16337,26 +16005,6 @@ toolchain { implies: "compiler_output_flags" } action_config { - config_name: "c++-header-preprocessing" - action_name: "c++-header-preprocessing" - tool { - tool_path: "wrapped_clang" - execution_requirement: "requires-darwin" - } - implies: "preprocessor_defines" - implies: "include_system_dirs" - implies: "version_min" - implies: "objc_arc" - implies: "no_objc_arc" - implies: "apple_env" - implies: "legacy_compile_flags" - implies: "user_compile_flags" - implies: "sysroot" - implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" - } - action_config { config_name: "objc-compile" action_name: "objc-compile" tool { |