authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-22 23:32:06-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-22 23:32:06-04:00
log1dcf540426103e762925f3365898d65b1724fdf1
treeb2975811e1f5725b232bbe53d5cdf35a8959cfe0
parentcb8dacabd8826c8edde53d42df63a06891cbade7
signaturelock-open Commit is signed but in an unrecognized format.

main.cpp: fix not ending progress node for zig build


1 files changed, 8 insertions(+), 0 deletions(-)

src/main.cpp+8
...@@ -626,6 +626,10 @@ int main(int argc, char **argv) {...@@ -626,6 +626,10 @@ int main(int argc, char **argv) {
626 g->root_package->package_table.put(buf_create_from_str("@build"), build_pkg);626 g->root_package->package_table.put(buf_create_from_str("@build"), build_pkg);
627 g->enable_cache = get_cache_opt(enable_cache, true);627 g->enable_cache = get_cache_opt(enable_cache, true);
628 codegen_build_and_link(g);628 codegen_build_and_link(g);
629 if (root_progress_node != nullptr) {
630 stage2_progress_end(root_progress_node);
631 root_progress_node = nullptr;
632 }
629633
630 Termination term;634 Termination term;
631 args.items[0] = buf_ptr(&g->output_file_path);635 args.items[0] = buf_ptr(&g->output_file_path);
...@@ -1280,6 +1284,10 @@ int main(int argc, char **argv) {...@@ -1280,6 +1284,10 @@ int main(int argc, char **argv) {
12801284
1281 g->enable_cache = get_cache_opt(enable_cache, cmd == CmdRun);1285 g->enable_cache = get_cache_opt(enable_cache, cmd == CmdRun);
1282 codegen_build_and_link(g);1286 codegen_build_and_link(g);
1287 if (root_progress_node != nullptr) {
1288 stage2_progress_end(root_progress_node);
1289 root_progress_node = nullptr;
1290 }
1283 if (timing_info)1291 if (timing_info)
1284 codegen_print_timing_report(g, stdout);1292 codegen_print_timing_report(g, stdout);
1285 if (stack_report)1293 if (stack_report)