mirror of
https://github.com/odin-lang/Odin.git
synced 2026-01-05 04:27:51 +00:00
Merge pull request #5860 from harold-b/hb.fix-export-link-libs-file
Fix `-export-linked-libs-file` issue where it multiple libraries in a single foreign export.
This commit is contained in:
22
src/main.cpp
22
src/main.cpp
@@ -2296,9 +2296,10 @@ gb_internal void export_linked_libraries(LinkerData *gen) {
|
||||
|
||||
for (auto *e : gen->foreign_libraries) {
|
||||
GB_ASSERT(e->kind == Entity_LibraryName);
|
||||
ast_node(imp, ForeignImportDecl, e->LibraryName.decl);
|
||||
|
||||
for (auto lib_path : e->LibraryName.paths) {
|
||||
lib_path = string_trim_whitespace(lib_path);
|
||||
for (isize i = 0; i < e->LibraryName.paths.count; i++) {
|
||||
String lib_path = string_trim_whitespace(e->LibraryName.paths[i]);
|
||||
if (lib_path.len == 0) {
|
||||
continue;
|
||||
}
|
||||
@@ -2319,16 +2320,15 @@ gb_internal void export_linked_libraries(LinkerData *gen) {
|
||||
}
|
||||
|
||||
gb_fprintf(&f, "\t");
|
||||
ast_node(imp, ForeignImportDecl, e->LibraryName.decl);
|
||||
for (Ast* file_path : imp->filepaths) {
|
||||
GB_ASSERT(file_path->tav.mode == Addressing_Constant && file_path->tav.value.kind == ExactValue_String);
|
||||
String file_path_str = file_path->tav.value.value_string;
|
||||
|
||||
if (string_starts_with(file_path_str, str_lit("system:"))) {
|
||||
gb_fprintf(&f, "system");
|
||||
} else {
|
||||
gb_fprintf(&f, "user");
|
||||
}
|
||||
Ast *file_path = imp->filepaths[i];
|
||||
GB_ASSERT(file_path->tav.mode == Addressing_Constant && file_path->tav.value.kind == ExactValue_String);
|
||||
String file_path_str = file_path->tav.value.value_string;
|
||||
|
||||
if (string_starts_with(file_path_str, str_lit("system:"))) {
|
||||
gb_fprintf(&f, "system");
|
||||
} else {
|
||||
gb_fprintf(&f, "user");
|
||||
}
|
||||
|
||||
gb_fprintf(&f, "\n");
|
||||
|
||||
Reference in New Issue
Block a user