aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorDragos Popescu <31741257+DragosPopse@users.noreply.github.com>2023-03-22 12:08:45 +0100
committerGitHub <noreply@github.com>2023-03-22 12:08:45 +0100
commit144d034475cd52e969f030d5b4b0864234445e6f (patch)
treebef548b1eb11640f9ae6671ae1cee4cabfba8e90 /src/main.cpp
parentef3d8bdc428a8248ff108f3a4d5ba0fc866ca9e3 (diff)
parente58915e12fdfc499b10adec4f3f0a61c7aa821ea (diff)
Merge branch 'odin-lang:master' into master
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 82c20cfe6..bbb28cdf8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -278,6 +278,13 @@ gb_internal i32 linker_stage(lbGenerator *gen) {
}
}
+ for (Entity *e : gen->foreign_libraries) {
+ GB_ASSERT(e->kind == Entity_LibraryName);
+ if (e->LibraryName.extra_linker_flags.len != 0) {
+ lib_str = gb_string_append_fmt(lib_str, " %.*s", LIT(e->LibraryName.extra_linker_flags));
+ }
+ }
+
if (build_context.build_mode == BuildMode_DynamicLibrary) {
link_settings = gb_string_append_fmt(link_settings, " /DLL");
} else {
@@ -449,6 +456,12 @@ gb_internal i32 linker_stage(lbGenerator *gen) {
}
}
+ for (Entity *e : gen->foreign_libraries) {
+ GB_ASSERT(e->kind == Entity_LibraryName);
+ if (e->LibraryName.extra_linker_flags.len != 0) {
+ lib_str = gb_string_append_fmt(lib_str, " %.*s", LIT(e->LibraryName.extra_linker_flags));
+ }
+ }
gbString object_files = gb_string_make(heap_allocator(), "");
defer (gb_string_free(object_files));