ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #775 from Tetralux/fix-type-table-unix

Browse Source 
Fix -build-mode:shared type table on Unix
This commit is contained in:
gingerBill
2020-11-06 20:51:06 +00:00
committed by GitHub
parent 6fab181c0d 140bb3ebfc
commit 7a7fddd1df
1 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+43 -35
View File
@@ -342,9 +342,9 @@ i32 linker_stage(lbGenerator *gen) {
lib_name = remove_extension_from_path(lib_name); lib_name = remove_extension_from_path(lib_name);
lib_str = gb_string_append_fmt(lib_str, " -framework %.*s ", LIT(lib_name)); lib_str = gb_string_append_fmt(lib_str, " -framework %.*s ", LIT(lib_name));
} else if (string_ends_with(lib, str_lit(".a")) || string_ends_with(lib, str_lit(".o")) || string_ends_with(lib, str_lit(".dylib"))) { } else if (string_ends_with(lib, str_lit(".a")) || string_ends_with(lib, str_lit(".o")) || string_ends_with(lib, str_lit(".dylib"))) {
// For: // For:
// object // object
// dynamic lib // dynamic lib
// static libs, absolute full path relative to the file in which the lib was imported from // static libs, absolute full path relative to the file in which the lib was imported from
lib_str = gb_string_append_fmt(lib_str, " %.*s ", LIT(lib)); lib_str = gb_string_append_fmt(lib_str, " %.*s ", LIT(lib));
} else { } else {
@@ -382,20 +382,33 @@ i32 linker_stage(lbGenerator *gen) {
// Unlike the Win32 linker code, the output_ext includes the dot, because // Unlike the Win32 linker code, the output_ext includes the dot, because
// typically executable files on *NIX systems don't have extensions. // typically executable files on *NIX systems don't have extensions.
String output_ext = {}; String output_ext = {};
char const *link_settings = ""; gbString link_settings = gb_string_make_reserve(heap_allocator(), 32);
char const *linker; char const *linker;
if (build_context.build_mode == BuildMode_DynamicLibrary) { if (build_context.build_mode == BuildMode_DynamicLibrary) {
// NOTE(tetra, 2020-11-06): __$startup_runtime must be called at DLL load time.
// Clang, for some reason, won't let us pass the '-init' flag that lets us do this,
// so use ld instead.
// :UseLDForShared
linker = "ld";
link_settings = gb_string_appendc(link_settings, "-init '__$startup_runtime' ");
// Shared libraries are .dylib on MacOS and .so on Linux. // Shared libraries are .dylib on MacOS and .so on Linux.
#if defined(GB_SYSTEM_OSX) #if defined(GB_SYSTEM_OSX)
output_ext = STR_LIT(".dylib"); output_ext = STR_LIT(".dylib");
link_settings = "-dylib -dynamic"; link_settings = gb_string_appendc(link_settings, "-dylib -dynamic ");
#else #else
output_ext = STR_LIT(".so"); output_ext = STR_LIT(".so");
link_settings = "-shared"; link_settings = gb_string_appendc(link_settings, "-shared ");
#endif #endif
} else { } else {
// TODO: Do I need anything here? #if defined(GB_SYSTEM_OSX)
link_settings = ""; linker = "ld";
#else
// TODO(zangent): Figure out how to make ld work on Linux.
// It probably has to do with including the entire CRT, but
// that's quite a complicated issue to solve while remaining distro-agnostic.
// Clang can figure out linker flags for us, and that's good enough _for now_.
linker = "clang -Wno-unused-command-line-argument";
#endif
} }
if (build_context.out_filepath.len > 0) { if (build_context.out_filepath.len > 0) {
@@ -406,16 +419,6 @@ i32 linker_stage(lbGenerator *gen) {
} }
} }
#if defined(GB_SYSTEM_OSX)
linker = "ld";
#else
// TODO(zangent): Figure out how to make ld work on Linux.
// It probably has to do with including the entire CRT, but
// that's quite a complicated issue to solve while remaining distro-agnostic.
// Clang can figure out linker flags for us, and that's good enough _for now_.
linker = "clang -Wno-unused-command-line-argument";
#endif
exit_code = system_exec_command_line_app("ld-link", exit_code = system_exec_command_line_app("ld-link",
"%s %s -o \"%.*s%.*s\" %s " "%s %s -o \"%.*s%.*s\" %s "
" %s " " %s "
@@ -2138,9 +2141,9 @@ int main(int arg_count, char const **arg_ptr) {
lib_str = gb_string_append_fmt(lib_str, " -framework %.*s ", LIT(lib_name)); lib_str = gb_string_append_fmt(lib_str, " -framework %.*s ", LIT(lib_name));
} else if (string_ends_with(lib, str_lit(".a")) || string_ends_with(lib, str_lit(".o")) || string_ends_with(lib, str_lit(".dylib"))) { } else if (string_ends_with(lib, str_lit(".a")) || string_ends_with(lib, str_lit(".o")) || string_ends_with(lib, str_lit(".dylib"))) {
// For: // For:
// object // object
// dynamic lib // dynamic lib
// static libs, absolute full path relative to the file in which the lib was imported from // static libs, absolute full path relative to the file in which the lib was imported from
lib_str = gb_string_append_fmt(lib_str, " %.*s ", LIT(lib)); lib_str = gb_string_append_fmt(lib_str, " %.*s ", LIT(lib));
} else { } else {
@@ -2171,22 +2174,36 @@ int main(int arg_count, char const **arg_ptr) {
// Unlike the Win32 linker code, the output_ext includes the dot, because // Unlike the Win32 linker code, the output_ext includes the dot, because
// typically executable files on *NIX systems don't have extensions. // typically executable files on *NIX systems don't have extensions.
String output_ext = {}; String output_ext = {};
char const *link_settings = ""; gbString link_settings = gb_string_make_reserve(heap_allocator(), 32);
char const *linker; char const *linker;
if (build_context.build_mode == BuildMode_DynamicLibrary) { if (build_context.build_mode == BuildMode_DynamicLibrary) {
// NOTE(tetra, 2020-11-06): __$startup_runtime must be called at DLL load time.
// Clang, for some reason, won't let us pass the '-init' flag that lets us do this,
// so use ld instead.
// :UseLDForShared
linker = "ld";
link_settings = gb_string_appendc(link_settings, "-init '__$startup_runtime' ");
// Shared libraries are .dylib on MacOS and .so on Linux. // Shared libraries are .dylib on MacOS and .so on Linux.
#if defined(GB_SYSTEM_OSX) #if defined(GB_SYSTEM_OSX)
output_ext = STR_LIT(".dylib"); output_ext = STR_LIT(".dylib");
link_settings = "-dylib -dynamic"; link_settings = gb_string_appendc(link_settings, "-dylib -dynamic ");
#else #else
output_ext = STR_LIT(".so"); output_ext = STR_LIT(".so");
link_settings = "-shared"; link_settings = gb_string_appendc(link_settings, "-shared ");
#endif #endif
} else { } else {
// TODO: Do I need anything here? #if defined(GB_SYSTEM_OSX)
link_settings = ""; linker = "ld";
#else
// TODO(zangent): Figure out how to make ld work on Linux.
// It probably has to do with including the entire CRT, but
// that's quite a complicated issue to solve while remaining distro-agnostic.
// Clang can figure out linker flags for us, and that's good enough _for now_.
linker = "clang -Wno-unused-command-line-argument";
#endif
} }
if (build_context.out_filepath.len > 0) { if (build_context.out_filepath.len > 0) {
//NOTE(thebirk): We have a custom -out arguments, so we should use the extension from that //NOTE(thebirk): We have a custom -out arguments, so we should use the extension from that
isize pos = string_extension_position(build_context.out_filepath); isize pos = string_extension_position(build_context.out_filepath);
@@ -2195,15 +2212,6 @@ int main(int arg_count, char const **arg_ptr) {
} }
} }
#if defined(GB_SYSTEM_OSX)
linker = "ld";
#else
// TODO(zangent): Figure out how to make ld work on Linux.
// It probably has to do with including the entire CRT, but
// that's quite a complicated issue to solve while remaining distro-agnostic.
// Clang can figure out linker flags for us, and that's good enough _for now_.
linker = "clang -Wno-unused-command-line-argument";
#endif
exit_code = system_exec_command_line_app("ld-link", exit_code = system_exec_command_line_app("ld-link",
"%s \"%.*s.o\" -o \"%.*s%.*s\" %s " "%s \"%.*s.o\" -o \"%.*s%.*s\" %s "