From 84fd40de77deb71544fce7c3c34177ee2f9c4405 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 30 May 2020 12:23:41 +0100 Subject: Fix rules for recursive initialization with procedure entities; Fix executable name if not given --- src/ir.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/ir.cpp') diff --git a/src/ir.cpp b/src/ir.cpp index 020b4ce44..f08c3569d 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -11485,9 +11485,17 @@ bool ir_gen_init(irGen *s, Checker *c) { if (build_context.out_filepath.len == 0) { s->output_name = remove_directory_from_path(init_fullpath); s->output_name = remove_extension_from_path(s->output_name); + s->output_name = string_trim_whitespace(s->output_name); + if (s->output_name.len == 0) { + s->output_name = c->info.init_scope->pkg->name; + } s->output_base = s->output_name; } else { s->output_name = build_context.out_filepath; + s->output_name = string_trim_whitespace(s->output_name); + if (s->output_name.len == 0) { + s->output_name = c->info.init_scope->pkg->name; + } isize pos = string_extension_position(s->output_name); if (pos < 0) { s->output_base = s->output_name; -- cgit v1.2.3