Do not add archiver_flags feature when crosstool already has one.

This is needed for migrating one of the internal crosstools RELNOTES: None. PiperOrigin-RevId: 158176295
dotordogh · Jun 7, 2017 · 5f83d09 · 5f83d09
1 parent 7aacb77
commit 5f83d09
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionConfigs.java
@@ -255,28 +255,27 @@ public static String getCppLinkActionConfigs(
                 "       }",
                 "   }",
                 "}",
-                "feature {",
-                "  name: 'archiver_flags'",
-                "  flag_set {",
-                "    expand_if_all_available: 'output_execpath'",
-                "    action: 'c++-link-static-library'",
-                "    action: 'c++-link-alwayslink-static-library'",
-                "    action: 'c++-link-pic-static-library'",
-                "    action: 'c++-link-alwayslink-pic-static-library'",
-                "    flag_group {",
-                ifLinux(
-                    platform,
-                    "  flag: 'rcsD'",
-                    "  flag: '%{output_execpath}'"),
-                ifMac(
-                    platform,
-                    "  flag: '-static'",
-                    "  flag: '-s'",
-                    "  flag: '-o'",
-                    "  flag: '%{output_execpath}'"),
-                "    }",
-                "  }",
-                "}",
+                ifTrue(
+                    !features.contains("archiver_flags"),
+                    "feature {",
+                    "  name: 'archiver_flags'",
+                    "  flag_set {",
+                    "    expand_if_all_available: 'output_execpath'",
+                    "    action: 'c++-link-static-library'",
+                    "    action: 'c++-link-alwayslink-static-library'",
+                    "    action: 'c++-link-pic-static-library'",
+                    "    action: 'c++-link-alwayslink-pic-static-library'",
+                    "    flag_group {",
+                    ifLinux(platform, "  flag: 'rcsD'", "  flag: '%{output_execpath}'"),
+                    ifMac(
+                        platform,
+                        "  flag: '-static'",
+                        "  flag: '-s'",
+                        "  flag: '-o'",
+                        "  flag: '%{output_execpath}'"),
+                    "    }",
+                    "  }",
+                    "}"),
                 "feature {",
                 "   name: 'libraries_to_link'",
                 "   flag_set {",