diff options
| author | Jeroen van Rijn <Kelimion@users.noreply.github.com> | 2022-04-26 14:52:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 14:52:58 +0200 |
| commit | f1c1cfb6d2e865e966593ee9815e619b6c581304 (patch) | |
| tree | 0b99532c281b427fb97d8ada3d6fbd53fbb19d9b /src/llvm_backend.cpp | |
| parent | 80df9fbc651aa9c919eaaab822a46d7f5cdad645 (diff) | |
| parent | ba5e33bc3518c327057102f56ac2c1cce55dc76f (diff) | |
Merge pull request #1747 from Kelimion/filename-merge
Filename generation
Diffstat (limited to 'src/llvm_backend.cpp')
| -rw-r--r-- | src/llvm_backend.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index f5cb84785..7781997f7 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -967,7 +967,12 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime) } String lb_filepath_ll_for_module(lbModule *m) { - String path = m->gen->output_base; + String path = concatenate3_strings(permanent_allocator(), + build_context.build_paths[BuildPath_Output].basename, + STR_LIT("/"), + build_context.build_paths[BuildPath_Output].name + ); + if (m->pkg) { path = concatenate3_strings(permanent_allocator(), path, STR_LIT("-"), m->pkg->name); } else if (USE_SEPARATE_MODULES) { @@ -978,7 +983,12 @@ String lb_filepath_ll_for_module(lbModule *m) { return path; } String lb_filepath_obj_for_module(lbModule *m) { - String path = m->gen->output_base; + String path = concatenate3_strings(permanent_allocator(), + build_context.build_paths[BuildPath_Output].basename, + STR_LIT("/"), + build_context.build_paths[BuildPath_Output].name + ); + if (m->pkg) { path = concatenate3_strings(permanent_allocator(), path, STR_LIT("-"), m->pkg->name); } |