diff options
Diffstat (limited to 'src/test')
3 files changed, 10 insertions, 849 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 c94b6ef302..0012d76dea 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 @@ -1243,58 +1243,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -1380,8 +1328,6 @@ 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" @@ -1405,8 +1351,6 @@ 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" @@ -1425,8 +1369,6 @@ 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" @@ -1445,8 +1387,6 @@ 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" @@ -1465,8 +1405,6 @@ 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" @@ -1494,8 +1432,6 @@ 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" @@ -1524,8 +1460,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" } action_config { config_name: "assemble" @@ -1542,8 +1476,6 @@ 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" @@ -1562,8 +1494,6 @@ 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" @@ -3040,58 +2970,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -3177,8 +3055,6 @@ 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" @@ -3202,8 +3078,6 @@ 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" @@ -3222,8 +3096,6 @@ 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" @@ -3242,8 +3114,6 @@ 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" @@ -3262,8 +3132,6 @@ 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" @@ -3291,8 +3159,6 @@ 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" @@ -3321,8 +3187,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" } action_config { config_name: "assemble" @@ -3339,8 +3203,6 @@ 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" @@ -3359,8 +3221,6 @@ 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" @@ -4837,58 +4697,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -4974,8 +4782,6 @@ 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" @@ -4999,8 +4805,6 @@ 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" @@ -5019,8 +4823,6 @@ 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" @@ -5039,8 +4841,6 @@ 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" @@ -5059,8 +4859,6 @@ 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" @@ -5088,8 +4886,6 @@ 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" @@ -5118,8 +4914,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" } action_config { config_name: "assemble" @@ -5136,8 +4930,6 @@ 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" @@ -5156,8 +4948,6 @@ 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" @@ -6634,58 +6424,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -6771,8 +6509,6 @@ 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" @@ -6796,8 +6532,6 @@ 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" @@ -6816,8 +6550,6 @@ 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" @@ -6836,8 +6568,6 @@ 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" @@ -6856,8 +6586,6 @@ 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" @@ -6885,8 +6613,6 @@ 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" @@ -6915,8 +6641,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" } action_config { config_name: "assemble" @@ -6933,8 +6657,6 @@ 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" @@ -6953,8 +6675,6 @@ 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" @@ -8439,58 +8159,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -8576,8 +8244,6 @@ 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" @@ -8601,8 +8267,6 @@ 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" @@ -8621,8 +8285,6 @@ 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" @@ -8641,8 +8303,6 @@ 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" @@ -8661,8 +8321,6 @@ 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" @@ -8690,8 +8348,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -8721,8 +8377,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -8740,8 +8394,6 @@ 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" @@ -8760,8 +8412,6 @@ 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" @@ -10248,58 +9898,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -10385,8 +9983,6 @@ 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" @@ -10410,8 +10006,6 @@ 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" @@ -10430,8 +10024,6 @@ 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" @@ -10450,8 +10042,6 @@ 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" @@ -10470,8 +10060,6 @@ 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" @@ -10499,8 +10087,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -10530,8 +10116,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -10549,8 +10133,6 @@ 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" @@ -10569,8 +10151,6 @@ 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" @@ -12082,58 +11662,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -12219,8 +11747,6 @@ 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 { @@ -12245,8 +11771,6 @@ 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 { @@ -12266,8 +11790,6 @@ 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 { @@ -12287,8 +11809,6 @@ 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 { @@ -12308,8 +11828,6 @@ 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 { @@ -12338,8 +11856,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -12369,8 +11885,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -12388,8 +11902,6 @@ 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 { @@ -12409,8 +11921,6 @@ 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 { @@ -13896,58 +13406,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -14033,8 +13491,6 @@ 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" @@ -14058,8 +13514,6 @@ 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" @@ -14078,8 +13532,6 @@ 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" @@ -14098,8 +13550,6 @@ 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" @@ -14118,8 +13568,6 @@ 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" @@ -14147,8 +13595,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -14178,8 +13624,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" implies: "apply_simulator_compiler_flags" } action_config { @@ -14197,8 +13641,6 @@ 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" @@ -14217,8 +13659,6 @@ 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" @@ -15725,58 +15165,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -15862,8 +15250,6 @@ 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" @@ -15887,8 +15273,6 @@ 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" @@ -15907,8 +15291,6 @@ 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" @@ -15927,8 +15309,6 @@ 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" @@ -15947,8 +15327,6 @@ 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" @@ -15976,8 +15354,6 @@ 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" @@ -16006,8 +15382,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" } action_config { config_name: "assemble" @@ -16024,8 +15398,6 @@ 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" @@ -16044,8 +15416,6 @@ 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" @@ -17554,58 +16924,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -17691,8 +17009,6 @@ 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" @@ -17716,8 +17032,6 @@ 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" @@ -17736,8 +17050,6 @@ 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" @@ -17756,8 +17068,6 @@ 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" @@ -17776,8 +17086,6 @@ 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" @@ -17805,8 +17113,6 @@ 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" @@ -17835,8 +17141,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" } action_config { config_name: "assemble" @@ -17853,8 +17157,6 @@ 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" @@ -17873,8 +17175,6 @@ 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" @@ -19408,58 +18708,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -19545,8 +18793,6 @@ 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 { @@ -19571,8 +18817,6 @@ 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 { @@ -19592,8 +18836,6 @@ 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 { @@ -19613,8 +18855,6 @@ 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 { @@ -19634,8 +18874,6 @@ 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 { @@ -19664,8 +18902,6 @@ 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" @@ -19694,8 +18930,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" } action_config { config_name: "assemble" @@ -19712,8 +18946,6 @@ 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 { @@ -19733,8 +18965,6 @@ 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 { @@ -21242,58 +20472,6 @@ toolchain { } } 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" - } - } - } - feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -21379,8 +20557,6 @@ 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" @@ -21404,8 +20580,6 @@ 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" @@ -21424,8 +20598,6 @@ 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" @@ -21444,8 +20616,6 @@ 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" @@ -21464,8 +20634,6 @@ 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" @@ -21493,8 +20661,6 @@ 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" @@ -21523,8 +20689,6 @@ toolchain { implies: "user_compile_flags" implies: "sysroot" implies: "unfiltered_compile_flags" - implies: "compiler_input_flags" - implies: "compiler_output_flags" } action_config { config_name: "assemble" @@ -21541,8 +20705,6 @@ 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" @@ -21561,8 +20723,6 @@ 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" diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java index 51a46ccb62..3bde118ad4 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java @@ -369,19 +369,19 @@ public class CcCommonTest extends BuildViewTestCase { " srcs = [ 'library.cc' ],", " nocopts = '-fPIC')"); - assertThat(getCppCompileAction("//a:pic").getArguments()).contains("-fPIC"); - assertThat(getCppCompileAction("//a:libpic.so").getArguments()).contains("-fPIC"); - assertThat(getCppCompileAction("//a:piclib").getArguments()).contains("-fPIC"); - assertThat(getCppCompileAction("//a:nopic").getArguments()).doesNotContain("-fPIC"); - assertThat(getCppCompileAction("//a:libnopic.so").getArguments()).doesNotContain("-fPIC"); - assertThat(getCppCompileAction("//a:nopiclib").getArguments()).doesNotContain("-fPIC"); + assertThat(getCppCompileAction("//a:pic").getArgv()).contains("-fPIC"); + assertThat(getCppCompileAction("//a:libpic.so").getArgv()).contains("-fPIC"); + assertThat(getCppCompileAction("//a:piclib").getArgv()).contains("-fPIC"); + assertThat(getCppCompileAction("//a:nopic").getArgv()).doesNotContain("-fPIC"); + assertThat(getCppCompileAction("//a:libnopic.so").getArgv()).doesNotContain("-fPIC"); + assertThat(getCppCompileAction("//a:nopiclib").getArgv()).doesNotContain("-fPIC"); } @Test public void testPicModeAssembly() throws Exception { useConfiguration("--cpu=k8"); scratch.file("a/BUILD", "cc_library(name='preprocess', srcs=['preprocess.S'])"); - List<String> argv = getCppCompileAction("//a:preprocess").getArguments(); + List<String> argv = getCppCompileAction("//a:preprocess").getArgv(); assertThat(argv).contains("-fPIC"); } 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 93d1c69452..e0fd56322a 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 @@ -92,7 +92,7 @@ public class CompileCommandLineTest extends BuildViewTestCase { " }", "}")) .build(); - assertThat(compileCommandLine.getArguments(/* overwrittenVariables= */ null)) + assertThat(compileCommandLine.getArgv(scratchArtifact("a/FakeOutput").getExecPath(), null)) .contains("-some_foo_flag"); } @@ -134,12 +134,13 @@ public class CompileCommandLineTest extends BuildViewTestCase { "}")) .setCoptsFilter(flag -> !flag.contains("i_am_a_flag")) .build(); - return compileCommandLine.getArguments(/* overwrittenVariables= */ null); + return compileCommandLine.getArgv(scratchArtifact("a/FakeOutput").getExecPath(), null); } private Builder makeCompileCommandLineBuilder() throws Exception { return CompileCommandLine.builder( scratchArtifact("a/FakeInput"), + scratchArtifact("a/FakeOutput"), new Predicate<String>() { @Override public boolean apply(String s) { |