diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/cpp/CROSSTOOL | 5 | ||||
-rw-r--r-- | tools/cpp/CROSSTOOL.tpl | 5 | ||||
-rw-r--r-- | tools/osx/crosstool/CROSSTOOL.tpl | 700 |
3 files changed, 700 insertions, 10 deletions
diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL index 0a96846be1..2588c3a4b7 100644 --- a/tools/cpp/CROSSTOOL +++ b/tools/cpp/CROSSTOOL @@ -673,11 +673,6 @@ toolchain { name: 'random_seed' } - # This feature is just for enabling flag_set in action_config for -c and -o options during the transitional period - feature { - name: 'compile_action_flags_in_flag_set' - } - action_config { config_name: 'c-compile' action_name: 'c-compile' diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl index f2dff43c63..08a3d8004e 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -238,11 +238,6 @@ toolchain { } } - # This feature is just for enabling flag_set in action_config for -c and -o options during the transitional period - feature { - name: 'compile_action_flags_in_flag_set' - } - # This feature indicates strip is not supported, building stripped binary will just result a copy of orignial binary feature { name: 'no_stripping' diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl index 8abffa5cd7..3b16480877 100644 --- a/tools/osx/crosstool/CROSSTOOL.tpl +++ b/tools/osx/crosstool/CROSSTOOL.tpl @@ -1128,6 +1128,58 @@ toolchain { expand_if_all_available: "linker_param_file" } } + feature { + name: "compiler_input_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-c" + flag: "%{source_file}" + } + expand_if_all_available: "source_file" + } + } + feature { + name: "compiler_output_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-o" + flag: "%{output_object_file}" + expand_if_all_available: "output_object_file" + } + flag_group { + flag: "-o" + flag: "%{output_assembly_file}" + flag: "-S" + expand_if_all_available: "output_assembly_file" + } + flag_group { + flag: "-o" + flag: "%{output_preprocess_file}" + flag: "-E" + expand_if_all_available: "output_preprocess_file" + } + } + } action_config { config_name: "strip" action_name: "strip" @@ -1182,6 +1234,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-compile" @@ -1200,6 +1254,8 @@ toolchain { 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" @@ -1218,6 +1274,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-parsing" @@ -1236,6 +1294,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-preprocessing" @@ -1254,6 +1314,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-compile" @@ -1268,6 +1330,8 @@ toolchain { flag: "x86_64" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "objc_actions" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" @@ -1298,6 +1362,8 @@ toolchain { flag: "-std=gnu++11" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" implies: "framework_paths" @@ -1327,6 +1393,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "preprocess-assemble" @@ -1345,6 +1413,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-archive" @@ -2723,6 +2793,58 @@ toolchain { expand_if_all_available: "linker_param_file" } } + feature { + name: "compiler_input_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-c" + flag: "%{source_file}" + } + expand_if_all_available: "source_file" + } + } + feature { + name: "compiler_output_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-o" + flag: "%{output_object_file}" + expand_if_all_available: "output_object_file" + } + flag_group { + flag: "-o" + flag: "%{output_assembly_file}" + flag: "-S" + expand_if_all_available: "output_assembly_file" + } + flag_group { + flag: "-o" + flag: "%{output_preprocess_file}" + flag: "-E" + expand_if_all_available: "output_preprocess_file" + } + } + } action_config { config_name: "strip" action_name: "strip" @@ -2777,6 +2899,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-compile" @@ -2795,6 +2919,8 @@ toolchain { 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" @@ -2813,6 +2939,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-parsing" @@ -2831,6 +2959,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-preprocessing" @@ -2849,6 +2979,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-compile" @@ -2863,6 +2995,8 @@ toolchain { flag: "x86_64" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "objc_actions" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" @@ -2894,6 +3028,8 @@ toolchain { flag: "-std=gnu++11" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" implies: "framework_paths" @@ -2924,6 +3060,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "preprocess-assemble" @@ -2942,6 +3080,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-archive" @@ -4322,6 +4462,58 @@ toolchain { expand_if_all_available: "linker_param_file" } } + feature { + name: "compiler_input_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-c" + flag: "%{source_file}" + } + expand_if_all_available: "source_file" + } + } + feature { + name: "compiler_output_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-o" + flag: "%{output_object_file}" + expand_if_all_available: "output_object_file" + } + flag_group { + flag: "-o" + flag: "%{output_assembly_file}" + flag: "-S" + expand_if_all_available: "output_assembly_file" + } + flag_group { + flag: "-o" + flag: "%{output_preprocess_file}" + flag: "-E" + expand_if_all_available: "output_preprocess_file" + } + } + } action_config { config_name: "strip" action_name: "strip" @@ -4376,6 +4568,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-compile" @@ -4394,6 +4588,8 @@ toolchain { 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" @@ -4412,6 +4608,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-parsing" @@ -4430,6 +4628,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-preprocessing" @@ -4448,6 +4648,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-compile" @@ -4462,6 +4664,8 @@ toolchain { flag: "i386" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "objc_actions" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" @@ -4493,6 +4697,8 @@ toolchain { flag: "-std=gnu++11" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" implies: "framework_paths" @@ -4523,6 +4729,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "preprocess-assemble" @@ -4541,6 +4749,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-archive" @@ -5943,6 +6153,58 @@ toolchain { expand_if_all_available: "linker_param_file" } } + feature { + name: "compiler_input_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-c" + flag: "%{source_file}" + } + expand_if_all_available: "source_file" + } + } + feature { + name: "compiler_output_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-o" + flag: "%{output_object_file}" + expand_if_all_available: "output_object_file" + } + flag_group { + flag: "-o" + flag: "%{output_assembly_file}" + flag: "-S" + expand_if_all_available: "output_assembly_file" + } + flag_group { + flag: "-o" + flag: "%{output_preprocess_file}" + flag: "-E" + expand_if_all_available: "output_preprocess_file" + } + } + } action_config { config_name: "strip" action_name: "strip" @@ -5997,6 +6259,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -6016,6 +6280,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -6035,6 +6301,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -6054,6 +6322,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -6073,6 +6343,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -6088,6 +6360,8 @@ toolchain { flag: "x86_64" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "objc_actions" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" @@ -6119,6 +6393,8 @@ toolchain { flag: "-std=gnu++11" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" implies: "framework_paths" @@ -6149,6 +6425,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -6168,6 +6446,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -7549,6 +7829,58 @@ toolchain { expand_if_all_available: "linker_param_file" } } + feature { + name: "compiler_input_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-c" + flag: "%{source_file}" + } + expand_if_all_available: "source_file" + } + } + feature { + name: "compiler_output_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-o" + flag: "%{output_object_file}" + expand_if_all_available: "output_object_file" + } + flag_group { + flag: "-o" + flag: "%{output_assembly_file}" + flag: "-S" + expand_if_all_available: "output_assembly_file" + } + flag_group { + flag: "-o" + flag: "%{output_preprocess_file}" + flag: "-E" + expand_if_all_available: "output_preprocess_file" + } + } + } action_config { config_name: "strip" action_name: "strip" @@ -7603,6 +7935,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-compile" @@ -7621,6 +7955,8 @@ toolchain { 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" @@ -7639,6 +7975,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-parsing" @@ -7657,6 +7995,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-preprocessing" @@ -7675,6 +8015,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-compile" @@ -7689,6 +8031,8 @@ toolchain { flag: "i386" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "objc_actions" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" @@ -7720,6 +8064,8 @@ toolchain { flag: "-std=gnu++11" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" implies: "framework_paths" @@ -7750,6 +8096,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "preprocess-assemble" @@ -7768,6 +8116,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-archive" @@ -9136,6 +9486,58 @@ toolchain { expand_if_all_available: "linker_param_file" } } + feature { + name: "compiler_input_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-c" + flag: "%{source_file}" + } + expand_if_all_available: "source_file" + } + } + feature { + name: "compiler_output_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-o" + flag: "%{output_object_file}" + expand_if_all_available: "output_object_file" + } + flag_group { + flag: "-o" + flag: "%{output_assembly_file}" + flag: "-S" + expand_if_all_available: "output_assembly_file" + } + flag_group { + flag: "-o" + flag: "%{output_preprocess_file}" + flag: "-E" + expand_if_all_available: "output_preprocess_file" + } + } + } action_config { config_name: "strip" action_name: "strip" @@ -9190,6 +9592,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-compile" @@ -9208,6 +9612,8 @@ toolchain { 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" @@ -9226,6 +9632,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-parsing" @@ -9244,6 +9652,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-preprocessing" @@ -9262,6 +9672,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-compile" @@ -9276,6 +9688,8 @@ toolchain { flag: "armv7" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "objc_actions" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" @@ -9306,6 +9720,8 @@ toolchain { flag: "-std=gnu++11" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" implies: "framework_paths" @@ -9335,6 +9751,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "preprocess-assemble" @@ -9353,6 +9771,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-archive" @@ -10723,6 +11143,58 @@ toolchain { expand_if_all_available: "linker_param_file" } } + feature { + name: "compiler_input_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-c" + flag: "%{source_file}" + } + expand_if_all_available: "source_file" + } + } + feature { + name: "compiler_output_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-o" + flag: "%{output_object_file}" + expand_if_all_available: "output_object_file" + } + flag_group { + flag: "-o" + flag: "%{output_assembly_file}" + flag: "-S" + expand_if_all_available: "output_assembly_file" + } + flag_group { + flag: "-o" + flag: "%{output_preprocess_file}" + flag: "-E" + expand_if_all_available: "output_preprocess_file" + } + } + } action_config { config_name: "strip" action_name: "strip" @@ -10777,6 +11249,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-compile" @@ -10795,6 +11269,8 @@ toolchain { 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" @@ -10813,6 +11289,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-parsing" @@ -10831,6 +11309,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-preprocessing" @@ -10849,6 +11329,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-compile" @@ -10863,6 +11345,8 @@ toolchain { flag: "armv7k" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "objc_actions" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" @@ -10893,6 +11377,8 @@ toolchain { flag: "-std=gnu++11" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" implies: "framework_paths" @@ -10922,6 +11408,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "preprocess-assemble" @@ -10940,6 +11428,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-archive" @@ -12332,6 +12822,58 @@ toolchain { expand_if_all_available: "linker_param_file" } } + feature { + name: "compiler_input_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-c" + flag: "%{source_file}" + } + expand_if_all_available: "source_file" + } + } + feature { + name: "compiler_output_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-o" + flag: "%{output_object_file}" + expand_if_all_available: "output_object_file" + } + flag_group { + flag: "-o" + flag: "%{output_assembly_file}" + flag: "-S" + expand_if_all_available: "output_assembly_file" + } + flag_group { + flag: "-o" + flag: "%{output_preprocess_file}" + flag: "-E" + expand_if_all_available: "output_preprocess_file" + } + } + } action_config { config_name: "strip" action_name: "strip" @@ -12386,6 +12928,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -12405,6 +12949,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -12424,6 +12970,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -12443,6 +12991,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -12462,6 +13012,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -12477,6 +13029,8 @@ toolchain { flag: "arm64" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "objc_actions" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" @@ -12507,6 +13061,8 @@ toolchain { flag: "-std=gnu++11" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" implies: "framework_paths" @@ -12536,6 +13092,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -12555,6 +13113,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "unfiltered_cxx_flags" } action_config { @@ -13926,6 +14486,58 @@ toolchain { expand_if_all_available: "linker_param_file" } } + feature { + name: "compiler_input_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-c" + flag: "%{source_file}" + } + expand_if_all_available: "source_file" + } + } + feature { + name: "compiler_output_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-o" + flag: "%{output_object_file}" + expand_if_all_available: "output_object_file" + } + flag_group { + flag: "-o" + flag: "%{output_assembly_file}" + flag: "-S" + expand_if_all_available: "output_assembly_file" + } + flag_group { + flag: "-o" + flag: "%{output_preprocess_file}" + flag: "-E" + expand_if_all_available: "output_preprocess_file" + } + } + } action_config { config_name: "strip" action_name: "strip" @@ -13980,6 +14592,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-compile" @@ -13998,6 +14612,8 @@ toolchain { 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" @@ -14016,6 +14632,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-parsing" @@ -14034,6 +14652,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-preprocessing" @@ -14052,6 +14672,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-compile" @@ -14066,6 +14688,8 @@ toolchain { flag: "arm64" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "objc_actions" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" @@ -14096,6 +14720,8 @@ toolchain { flag: "-std=gnu++11" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" implies: "framework_paths" @@ -14125,6 +14751,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "preprocess-assemble" @@ -14143,6 +14771,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-archive" @@ -15517,6 +16147,58 @@ toolchain { expand_if_all_available: "linker_param_file" } } + feature { + name: "compiler_input_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-c" + flag: "%{source_file}" + } + expand_if_all_available: "source_file" + } + } + feature { + name: "compiler_output_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: "objc-compile" + action: "objc++-compile" + flag_group { + flag: "-o" + flag: "%{output_object_file}" + expand_if_all_available: "output_object_file" + } + flag_group { + flag: "-o" + flag: "%{output_assembly_file}" + flag: "-S" + expand_if_all_available: "output_assembly_file" + } + flag_group { + flag: "-o" + flag: "%{output_preprocess_file}" + flag: "-E" + expand_if_all_available: "output_preprocess_file" + } + } + } action_config { config_name: "strip" action_name: "strip" @@ -15571,6 +16253,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-compile" @@ -15589,6 +16273,8 @@ toolchain { 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" @@ -15607,6 +16293,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-parsing" @@ -15625,6 +16313,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "c++-header-preprocessing" @@ -15643,6 +16333,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-compile" @@ -15657,6 +16349,8 @@ toolchain { flag: "<architecture>" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "objc_actions" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" @@ -15687,6 +16381,8 @@ toolchain { flag: "-std=gnu++11" } } + implies: "compiler_input_flags" + implies: "compiler_output_flags" implies: "apply_default_compiler_flags" implies: "apply_default_warnings" implies: "framework_paths" @@ -15716,6 +16412,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "preprocess-assemble" @@ -15734,6 +16432,8 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" + implies: "compiler_input_flags" + implies: "compiler_output_flags" } action_config { config_name: "objc-archive" |