Mention incompatible flag name in error messages

Let's make the error message clear which incompatible flag caused the failure. RELNOTES: None. PiperOrigin-RevId: 212405170
bazelbuild · Sep 11, 2018 · 1b73bc3 · 1b73bc3
1 parent c062b1f
commit 1b73bc3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -1182,8 +1182,12 @@ public boolean disableDepsetInUserFlags() {
   private void checkForToolchainSkylarkApiAvailability() throws EvalException {
     if (cppOptions.disableLegacyToolchainSkylarkApi
         || !cppOptions.enableLegacyToolchainSkylarkApi) {
-      throw new EvalException(null, "Information about the C++ toolchain API is not accessible "
-          + "anymore through ctx.fragments.cpp . Use CcToolchainInfo instead.");
+      throw new EvalException(
+          null,
+          "Information about the C++ toolchain API is not accessible "
+              + "anymore through ctx.fragments.cpp "
+              + "(See --incompatible_disable_legacy_cpp_toolchain_skylark_api). "
+              + "Use CcToolchainInfo instead.");
     }
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
@@ -288,7 +288,8 @@ private Label selectCcToolchainLabel(
             errorMessage
                 + String.format(
                     ", you may want to add an entry for '%s|%s' into toolchains and "
-                        + "toolchain_identifier '%s' into the corresponding cc_toolchain rule.",
+                        + "toolchain_identifier '%s' into the corresponding cc_toolchain rule "
+                        + "(see --incompatible_disable_cc_toolchain_label_from_crosstool_proto).",
                     toolchain.getTargetCpu(),
                     toolchain.getCompiler(),
                     toolchain.getToolchainIdentifier()));