Modify the legacy features to pass flags to lto-index actions as well

With bazelbuild/bazel#6791 Bazel will not obtain these flags from C++ link actions anymore. RELNOTES: None. PiperOrigin-RevId: 256340042
luca-digrazia · Sep 4, 2022 · 1b46105 · 1b46105
1 parent 75b435b
commit 1b46105
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...elbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java b/...elbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java
@@ -298,8 +298,8 @@ public static ImmutableList<CToolchain.Feature> getLegacyFeatures(
                         "    flag_group {",
                         "      expand_if_all_available: 'fdo_profile_path'",
                         "      flag: '-fprofile-use=%{fdo_profile_path}'",
-                        "      flag: '-Wno-profile-instr-unprofiled'",
-                        "      flag: '-Wno-profile-instr-out-of-date'",
+                        "      flag: '-Xclang-only=-Wno-profile-instr-unprofiled'",
+                        "      flag: '-Xclang-only=-Wno-profile-instr-out-of-date'",
                         "      flag: '-fprofile-correction'",
                         "    }",
                         "  }")));
@@ -341,8 +341,8 @@ public static ImmutableList<CToolchain.Feature> getLegacyFeatures(
                         "    flag_group {",
                         "      expand_if_all_available: 'fdo_profile_path'",
                         "      flag: '-fprofile-use=%{fdo_profile_path}'",
-                        "      flag: '-Wno-profile-instr-unprofiled'",
-                        "      flag: '-Wno-profile-instr-out-of-date'",
+                        "      flag: '-Xclang-only=-Wno-profile-instr-unprofiled'",
+                        "      flag: '-Xclang-only=-Wno-profile-instr-out-of-date'",
                         "      flag: '-fprofile-correction'",
                         "    }",
                         "  }")));
@@ -360,8 +360,9 @@ public static ImmutableList<CToolchain.Feature> getLegacyFeatures(
                         "    action: 'lto-backend'",
                         "    flag_group {",
                         "      expand_if_all_available: 'fdo_prefetch_hints_path'",
-                        "      flag: '-mllvm'",
-                        "      flag: '-prefetch-hints-file=" + "%{fdo_prefetch_hints_path}'",
+                        "      flag: '-Xclang-only=-mllvm'",
+                        "      flag: '-Xclang-only=-prefetch-hints-file="
+                            + "%{fdo_prefetch_hints_path}'",
                         "    }",
                         "  }")));
       }
@@ -1572,7 +1573,7 @@ public static ImmutableList<CToolchain.Feature> getFeaturesToAppearLastInFeature
   }
 
   private static String ifLinux(CppPlatform platform, String... lines) {
-    // Platform `LINUX` also includes FreeBSD and OpenBSD.
+    // Platform `LINUX` also includes FreeBSD.
     return ifTrue(platform == CppPlatform.LINUX, lines);
   }