aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build
diff options
context:
space:
mode:
authorGravatar hlopko <hlopko@google.com>2018-05-16 12:32:32 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-05-16 12:34:09 -0700
commit6f1a2ecbc05a3d8f7864de8ab085e6c6ec5b9f1a (patch)
tree729ba817da985381dcb9905bc14dd489f43fc845 /src/main/java/com/google/devtools/build
parent391c4cf4acdc33717b24a1338f51961edac2cb98 (diff)
Replace use of output_object_file with output_file in CROSSTOOLS.
RELNOTES: None. PiperOrigin-RevId: 196870840
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java12
1 files changed, 4 insertions, 8 deletions
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}'",
" }",
" }",
"}")));