From 6f1a2ecbc05a3d8f7864de8ab085e6c6ec5b9f1a Mon Sep 17 00:00:00 2001 From: hlopko Date: Wed, 16 May 2018 12:32:32 -0700 Subject: Replace use of output_object_file with output_file in CROSSTOOLS. RELNOTES: None. PiperOrigin-RevId: 196870840 --- .../devtools/build/lib/rules/cpp/CppActionConfigs.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp') diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java index 626f343015..f1ec0a19a3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java @@ -1145,21 +1145,17 @@ public class CppActionConfigs { " action: 'c++-header-parsing'", " action: 'lto-backend'", " flag_group {", - " expand_if_all_available: 'output_object_file'", - " flag: '-o'", - " flag: '%{output_object_file}'", - " }", - " flag_group {", " expand_if_all_available: 'output_assembly_file'", " flag: '-S'", - " flag: '-o'", - " flag: '%{output_assembly_file}'", " }", " flag_group {", " expand_if_all_available: 'output_preprocess_file'", " flag: '-E'", + " }", + " flag_group {", + " expand_if_all_available: 'output_file'", " flag: '-o'", - " flag: '%{output_preprocess_file}'", + " flag: '%{output_file}'", " }", " }", "}"))); -- cgit v1.2.3