From 472ee184862415d1f2651d81d248f3000032932d Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 4 Sep 2020 13:46:14 -0700 Subject: [PATCH] stage2: infer --name in more ways --- src-self-hosted/main.zig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src-self-hosted/main.zig b/src-self-hosted/main.zig index 9e5a5b73f7..3ee91d54a2 100644 --- a/src-self-hosted/main.zig +++ b/src-self-hosted/main.zig @@ -770,8 +770,16 @@ pub fn buildOutputType( const root_name = if (provided_name) |n| n else blk: { if (root_src_file) |file| { const basename = fs.path.basename(file); - var it = mem.split(basename, "."); - break :blk it.next() orelse basename; + break :blk mem.split(basename, ".").next().?; + } else if (c_source_files.items.len == 1) { + const basename = fs.path.basename(c_source_files.items[0]); + break :blk mem.split(basename, ".").next().?; + } else if (link_objects.items.len == 1) { + const basename = fs.path.basename(link_objects.items[0]); + break :blk mem.split(basename, ".").next().?; + } else if (emit_bin == .yes) { + const basename = fs.path.basename(emit_bin.yes); + break :blk mem.split(basename, ".").next().?; } else { fatal("--name [name] not provided and unable to infer", .{}); }