|
@@ -341,16 +341,13 @@ i32 linker_stage(lbGenerator *gen) {
|
|
|
String lib_name = lib;
|
|
|
lib_name = remove_extension_from_path(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")))
|
|
|
- {
|
|
|
- // For:
|
|
|
- // object
|
|
|
- // dynamic lib
|
|
|
- // 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));
|
|
|
- } else {
|
|
|
+ } else if (string_ends_with(lib, str_lit(".a")) || string_ends_with(lib, str_lit(".o")) || string_ends_with(lib, str_lit(".dylib"))) {
|
|
|
+ // For:
|
|
|
+ // object
|
|
|
+ // dynamic lib
|
|
|
+ // 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));
|
|
|
+ } else {
|
|
|
// dynamic or static system lib, just link regularly searching system library paths
|
|
|
lib_str = gb_string_append_fmt(lib_str, " -l%.*s ", LIT(lib));
|
|
|
}
|
|
@@ -434,12 +431,12 @@ i32 linker_stage(lbGenerator *gen) {
|
|
|
" -e _main "
|
|
|
#endif
|
|
|
, linker, object_files, LIT(output_base), LIT(output_ext),
|
|
|
- #if defined(GB_SYSTEM_OSX)
|
|
|
- "-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib",
|
|
|
- #else
|
|
|
- "-lc -lm",
|
|
|
- #endif
|
|
|
- lib_str,
|
|
|
+ #if defined(GB_SYSTEM_OSX)
|
|
|
+ "-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib",
|
|
|
+ #else
|
|
|
+ "-lc -lm",
|
|
|
+ #endif
|
|
|
+ lib_str,
|
|
|
LIT(build_context.link_flags),
|
|
|
LIT(build_context.extra_linker_flags),
|
|
|
link_settings);
|
|
@@ -2139,16 +2136,13 @@ int main(int arg_count, char const **arg_ptr) {
|
|
|
String lib_name = lib;
|
|
|
lib_name = remove_extension_from_path(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")))
|
|
|
- {
|
|
|
- // For:
|
|
|
- // object
|
|
|
- // dynamic lib
|
|
|
- // 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));
|
|
|
- } else {
|
|
|
+ } else if (string_ends_with(lib, str_lit(".a")) || string_ends_with(lib, str_lit(".o")) || string_ends_with(lib, str_lit(".dylib"))) {
|
|
|
+ // For:
|
|
|
+ // object
|
|
|
+ // dynamic lib
|
|
|
+ // 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));
|
|
|
+ } else {
|
|
|
// dynamic or static system lib, just link regularly searching system library paths
|
|
|
lib_str = gb_string_append_fmt(lib_str, " -l%.*s ", LIT(lib));
|
|
|
}
|
|
@@ -2226,11 +2220,11 @@ int main(int arg_count, char const **arg_ptr) {
|
|
|
#endif
|
|
|
, linker, LIT(output_base), LIT(output_base), LIT(output_ext),
|
|
|
lib_str,
|
|
|
- #if defined(GB_SYSTEM_OSX)
|
|
|
- "-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib",
|
|
|
- #else
|
|
|
- "-lc -lm",
|
|
|
- #endif
|
|
|
+ #if defined(GB_SYSTEM_OSX)
|
|
|
+ "-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib",
|
|
|
+ #else
|
|
|
+ "-lc -lm",
|
|
|
+ #endif
|
|
|
LIT(build_context.link_flags),
|
|
|
LIT(build_context.extra_linker_flags),
|
|
|
link_settings);
|