diff options
author | hlopko <hlopko@google.com> | 2017-09-05 18:12:26 +0200 |
---|---|---|
committer | Yun Peng <pcloudy@google.com> | 2017-09-06 10:10:06 +0200 |
commit | 268c0bcbf79f9f3f72d95fa51af0f1b18c5ce29e (patch) | |
tree | 45bf496a5de6652214a7a06001390ab87bd1f6ee /src/test/java/com/google/devtools/build/lib/packages | |
parent | 87f40973c52e3323abe8a2e850296026671cb6ad (diff) |
Introduce unfiltered_compile_flags build variable, rename copts variable to user_compile_flags
Also add magic to a feature named 'unfiltered_compile_flags' so the flags
expanded from it are not subject to nocopt filtering.
RELNOTES: None.
PiperOrigin-RevId: 167587189
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL | 1044 |
1 files changed, 888 insertions, 156 deletions
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 86e7e7c344..f01c9e1fce 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 @@ -208,6 +208,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -1158,7 +1179,7 @@ toolchain { name: "bitcode_embedded" } feature { - name: "copts" + name: "user_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -1168,13 +1189,35 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" + } + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -1259,7 +1302,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-compile" @@ -1279,7 +1324,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-module-compile" @@ -1294,7 +1341,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-parsing" @@ -1309,7 +1358,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-preprocessing" @@ -1324,7 +1375,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-compile" @@ -1348,7 +1401,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc++-compile" @@ -1373,7 +1428,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "assemble" @@ -1386,7 +1443,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "preprocess-assemble" @@ -1401,7 +1460,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-archive" @@ -1841,6 +1902,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -2791,7 +2873,7 @@ toolchain { name: "bitcode_embedded" } feature { - name: "copts" + name: "user_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -2801,13 +2883,35 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" + } + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -2892,7 +2996,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-compile" @@ -2912,7 +3018,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-module-compile" @@ -2927,7 +3035,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-parsing" @@ -2942,7 +3052,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-preprocessing" @@ -2957,7 +3069,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-compile" @@ -2981,7 +3095,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc++-compile" @@ -3006,7 +3122,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "assemble" @@ -3019,7 +3137,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "preprocess-assemble" @@ -3034,7 +3154,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-archive" @@ -3474,6 +3596,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -4424,7 +4567,28 @@ toolchain { name: "bitcode_embedded" } feature { - name: "copts" + name: "user_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" + } + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -4434,13 +4598,14 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -4525,7 +4690,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-compile" @@ -4545,7 +4712,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-module-compile" @@ -4560,7 +4729,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-parsing" @@ -4575,7 +4746,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-preprocessing" @@ -4590,7 +4763,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-compile" @@ -4614,7 +4789,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc++-compile" @@ -4639,7 +4816,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "assemble" @@ -4652,7 +4831,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "preprocess-assemble" @@ -4667,7 +4848,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-archive" @@ -5107,6 +5290,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -6057,7 +6261,7 @@ toolchain { name: "bitcode_embedded" } feature { - name: "copts" + name: "user_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -6067,13 +6271,35 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" + } + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -6158,7 +6384,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-compile" @@ -6178,7 +6406,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-module-compile" @@ -6193,7 +6423,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-parsing" @@ -6208,7 +6440,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-preprocessing" @@ -6223,7 +6457,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-compile" @@ -6247,7 +6483,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc++-compile" @@ -6272,7 +6510,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "assemble" @@ -6285,7 +6525,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "preprocess-assemble" @@ -6300,7 +6542,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-archive" @@ -6744,6 +6988,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -7698,7 +7963,7 @@ toolchain { name: "bitcode_embedded" } feature { - name: "copts" + name: "user_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -7708,13 +7973,35 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" + } + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -7799,7 +8086,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-compile" @@ -7819,7 +8108,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-module-compile" @@ -7834,7 +8125,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-parsing" @@ -7849,7 +8142,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-preprocessing" @@ -7864,7 +8159,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-compile" @@ -7888,7 +8185,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -7914,7 +8213,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -7928,7 +8229,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "preprocess-assemble" @@ -7943,7 +8246,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-archive" @@ -8387,6 +8692,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -9343,7 +9669,28 @@ toolchain { name: "bitcode_embedded" } feature { - name: "copts" + name: "user_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" + } + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -9353,13 +9700,14 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -9444,7 +9792,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-compile" @@ -9464,7 +9814,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-module-compile" @@ -9479,7 +9831,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-parsing" @@ -9494,7 +9848,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-preprocessing" @@ -9509,7 +9865,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-compile" @@ -9533,7 +9891,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -9559,7 +9919,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -9573,7 +9935,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "preprocess-assemble" @@ -9588,7 +9952,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-archive" @@ -10033,6 +10399,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -11013,7 +11400,7 @@ toolchain { name: "bitcode_embedded" } feature { - name: "copts" + name: "user_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -11023,13 +11410,35 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" + } + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -11114,7 +11523,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -11135,7 +11546,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -11151,7 +11564,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -11167,7 +11582,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -11183,7 +11600,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -11208,7 +11627,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -11234,7 +11655,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -11248,7 +11671,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -11264,7 +11689,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -11709,6 +12136,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -12663,7 +13111,7 @@ toolchain { name: "bitcode_embedded" } feature { - name: "copts" + name: "user_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -12673,13 +13121,35 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" + } + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -12764,7 +13234,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-compile" @@ -12784,7 +13256,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-module-compile" @@ -12799,7 +13273,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-parsing" @@ -12814,7 +13290,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-preprocessing" @@ -12829,7 +13307,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-compile" @@ -12853,7 +13333,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -12879,7 +13361,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -12893,7 +13377,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "preprocess-assemble" @@ -12908,7 +13394,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-archive" @@ -13352,6 +13840,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -14328,7 +14837,28 @@ toolchain { } } feature { - name: "copts" + name: "user_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" + } + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -14338,13 +14868,14 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -14429,7 +14960,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-compile" @@ -14449,7 +14982,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-module-compile" @@ -14464,7 +14999,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-parsing" @@ -14479,7 +15016,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-preprocessing" @@ -14494,7 +15033,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-compile" @@ -14518,7 +15059,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc++-compile" @@ -14543,7 +15086,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "assemble" @@ -14556,7 +15101,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "preprocess-assemble" @@ -14571,7 +15118,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-archive" @@ -15015,6 +15564,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -15993,7 +16563,7 @@ toolchain { } } feature { - name: "copts" + name: "user_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -16003,13 +16573,35 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" + } + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -16094,7 +16686,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-compile" @@ -16114,7 +16708,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-module-compile" @@ -16129,7 +16725,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-parsing" @@ -16144,7 +16742,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-preprocessing" @@ -16159,7 +16759,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-compile" @@ -16183,7 +16785,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc++-compile" @@ -16208,7 +16812,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "assemble" @@ -16221,7 +16827,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "preprocess-assemble" @@ -16236,7 +16844,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-archive" @@ -16681,6 +17291,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -17683,7 +18314,7 @@ toolchain { } } feature { - name: "copts" + name: "user_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -17693,13 +18324,35 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" + } + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -17784,7 +18437,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -17805,7 +18460,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -17821,7 +18478,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -17837,7 +18496,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -17853,7 +18514,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -17878,7 +18541,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc++-compile" @@ -17903,7 +18568,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "assemble" @@ -17916,7 +18583,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -17932,7 +18601,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -18377,6 +19048,27 @@ toolchain { name: "is_not_test_target" } feature { + name: "legacy_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{legacy_compile_flags}" + iterate_over: "legacy_compile_flags" + } + expand_if_all_available: "legacy_compile_flags" + } + } + feature { name: "generate_dsym_file" flag_set { action: "c-compile" @@ -19353,7 +20045,28 @@ toolchain { } } feature { - name: "copts" + name: "user_compile_flags" + flag_set { + action: "assemble" + action: "preprocess-assemble" + 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" + action: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "%{user_compile_flags}" + iterate_over: "user_compile_flags" + } + expand_if_all_available: "user_compile_flags" + } + } + feature { + name: "unfiltered_compile_flags" flag_set { action: "assemble" action: "preprocess-assemble" @@ -19363,13 +20076,14 @@ toolchain { action: "c++-header-preprocessing" action: "c++-module-compile" action: "c++-module-codegen" + action: "lto-backend" action: "objc-compile" action: "objc++-compile" flag_group { - flag: "%{copts}" - iterate_over: "copts" + flag: "%{unfiltered_compile_flags}" + iterate_over: "unfiltered_compile_flags" } - expand_if_all_available: "copts" + expand_if_all_available: "unfiltered_compile_flags" } } feature { @@ -19454,7 +20168,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-compile" @@ -19474,7 +20190,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-module-compile" @@ -19489,7 +20207,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-parsing" @@ -19504,7 +20224,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "c++-header-preprocessing" @@ -19519,7 +20241,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-compile" @@ -19543,7 +20267,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc++-compile" @@ -19568,7 +20294,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "assemble" @@ -19581,7 +20309,9 @@ toolchain { implies: "no_objc_arc" implies: "include_system_dirs" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "preprocess-assemble" @@ -19596,7 +20326,9 @@ toolchain { implies: "objc_arc" implies: "no_objc_arc" implies: "apple_env" - implies: "copts" + implies: "legacy_compile_flags" + implies: "user_compile_flags" + implies: "unfiltered_compile_flags" } action_config { config_name: "objc-archive" |