diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java | 15 |
1 files changed, 7 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 b6b2e733b1..1bb49fecaa 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 @@ -634,16 +634,15 @@ public class CppActionConfigs { "feature {", " name: 'archiver_flags'", " flag_set {", - " expand_if_all_available: 'output_execpath'", " action: 'c++-link-static-library'", " flag_group {", - ifLinux(platform, "flag: 'rcsD'", "flag: '%{output_execpath}'"), - ifMac( - platform, - " flag: '-static'", - " flag: '-s'", - " flag: '-o'", - " flag: '%{output_execpath}'"), + ifLinux(platform, "flag: 'rcsD'"), + ifMac(platform, "flag: '-static'", "flag: '-s'"), + " }", + " flag_group {", + " expand_if_all_available: 'output_execpath'", + ifLinux(platform, "flag: '%{output_execpath}'"), + ifMac(platform, "flag: '-o'", "flag: '%{output_execpath}'"), " }", " }", " flag_set { ", |