diff options
| author | Karl Zylinski <karl@zylinski.se> | 2022-04-27 20:50:54 +0200 |
|---|---|---|
| committer | Karl Zylinski <karl@zylinski.se> | 2022-04-27 20:50:54 +0200 |
| commit | 5650087aa3561b5972dde34890de2639a3d3ca54 (patch) | |
| tree | 9905467b5376bc480da0e321643cd1761ae43319 /src/llvm_backend.cpp | |
| parent | 67689ecb21bc1735871b36fdf1411fbffb02e8fb (diff) | |
| parent | c5982e52d57ceba420d70f1d8d9d10197f4c7d61 (diff) | |
Merge remote-tracking branch 'origin/master' into d3d12-binding-fixes
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); } |