shishantbiswas/c3c
1
1
Fork 0
mirror of https://github.com/c3lang/c3c.git synced 2026-02-27 12:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix final? issues with -o.

Browse Source
This commit is contained in:
Christoffer Lerno
2025-02-26 02:51:42 +01:00
parent 96943ca66f
commit 6d3c1f5d2f
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/codegen_general.c
View File

@@ -301,12 +301,15 @@ void codegen_setup_object_names(Module *module, const char **ir_filename, const
assert(compiler.build.object_file_dir);
if (codegen_single_obj_output())
{
const char *res = compiler.build.output_name;
if (!res) res = compiler.build.name;
if (!res) res = result;
const char *ext = get_object_extension();
if (!str_has_suffix(result, ext))
if (!str_has_suffix(res, ext))
{
result = str_printf("%s%s", result, ext);
res = str_printf("%s%s", result, ext);
}
compiler.obj_output = *object_filename = file_append_path(compiler.build.output_dir ? compiler.build.output_dir : ".", result);
compiler.obj_output = *object_filename = file_append_path(compiler.build.output_dir ? compiler.build.output_dir : ".", res);
char *dir_path = NULL;
char *filename = NULL;
file_get_dir_and_filename_from_full(compiler.obj_output, &filename, &dir_path);
@@ -314,7 +317,6 @@ void codegen_setup_object_names(Module *module, const char **ir_filename, const
{
error_exit("Can't output '%s', the directory '%s' could not be found.", compiler.obj_output, dir_path);
}
result = str_remove_suffix(filename, ext);
}
else
{

5
src/compiler/module.c
View File

@@ -43,11 +43,6 @@ void scratch_buffer_append_module(Module *module, bool is_export)
const char *module_create_object_file_name(Module *module)
{
if (compiler.build.single_module == SINGLE_MODULE_ON)
{
if (compiler.build.output_name) return compiler.build.output_name;
if (compiler.build.name) return compiler.build.name;
}
scratch_buffer_clear();
char c;
const char *name = module->name->module;