commit c7bbac32bb0695ed38bbc2ebc37b80f851d406c4
author Nico Weber <thakis@chromium.org> Tue Jun 09 15:13:17 2020 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Jun 09 19:26:17 2020 +0000
tree 2c67e70d4272d4cc8ead86696a907ba7119aae1b
parent d26b346f45e469be76ebf2b2ba8a31f8839c9066

Don't assert on gn builds without any target.

NinjaWriter::RunAndWriteFiles() returned false but wrote a diag
to stdout instead of filling in *err. Later, RunGen() would
call `err.PrintToStdout();` when RunAndWriteFiles() returned false,
which DCHECK(has_error_)ed which failed since err wasn't set.

Change-Id: Ia4ca29507bcc3855da3d6c233c6f13b9538ea96d
Bug: none
Reviewed-on: https://gn-review.googlesource.com/c/gn/+/8800
Commit-Queue: Brett Wilson <brettw@chromium.org>
Reviewed-by: Brett Wilson <brettw@chromium.org>

src/gn/ninja_writer.cc

diff --git a/src/gn/ninja_writer.cc b/src/gn/ninja_writer.cc
index b2bd98a..999718a 100644
--- a/src/gn/ninja_writer.cc
+++ b/src/gn/ninja_writer.cc
@@ -31,9 +31,8 @@
 bool NinjaWriter::WriteToolchains(const PerToolchainRules& per_toolchain_rules,
                                   Err* err) {
   if (per_toolchain_rules.empty()) {
-    Err(Location(), "No targets.",
-        "I could not find any targets to write, so I'm doing nothing.")
-        .PrintToStdout();
+    *err = Err(Location(), "No targets.",
+        "I could not find any targets to write, so I'm doing nothing.");
     return false;
   }
 
@@ -42,8 +41,8 @@
     const Settings* settings =
         builder_.loader()->GetToolchainSettings(toolchain->label());
     if (!NinjaToolchainWriter::RunAndWriteFile(settings, toolchain, i.second)) {
-      Err(Location(), "Couldn't open toolchain buildfile(s) for writing")
-          .PrintToStdout();
+      *err =
+          Err(Location(), "Couldn't open toolchain buildfile(s) for writing");
       return false;
     }
   }