diff options
| author | Zachary Pierson <zacpiersonhehe@gmail.com> | 2017-11-21 16:16:53 -0600 |
|---|---|---|
| committer | Zachary Pierson <zacpiersonhehe@gmail.com> | 2017-11-21 16:16:53 -0600 |
| commit | 4d7fb3e8d6b24340fe9f4217e2c2c04e9a0f3a76 (patch) | |
| tree | e92e186e152551cf804642361ac7e69e042b3897 /src/main.cpp | |
| parent | bcca3bf3221e1b83f804029e53855cbfc2450baf (diff) | |
Changed `string_has_extension` to `string_ends_with`.
Fixed macOS target triple.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index cc58a7144..7d9470a0f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -859,10 +859,10 @@ int main(int arg_count, char **arg_ptr) { if (lib.len > 2 && lib[0] == '-' && lib[1] == 'f') { // framework thingie lib_str = gb_string_append_fmt(lib_str, " -framework %.*s ", (int)(lib.len) - 2, lib.text + 2); - } else if (string_has_extension(lib, str_lit("a"))) { + } else if (string_ends_with(lib, str_lit(".a"))) { // 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 if (string_has_extension(lib, str_lit("dylib"))) { + } else if (string_ends_with(lib, str_lit(".dylib"))) { // dynamic lib, relative path to executable lib_str = gb_string_append_fmt(lib_str, " -l:%s/%.*s ", cwd, LIT(lib)); } else { @@ -875,10 +875,10 @@ int main(int arg_count, char **arg_ptr) { // available at runtime wherever the executable is run, so we make require those to be // local to the executable (unless the system collection is used, in which case we search // the system library paths for the library file). - if (string_has_extension(lib, str_lit("a"))) { + if (string_ends_with(lib, str_lit(".a"))) { // static libs, absolute full path relative to the file in which the lib was imported from lib_str = gb_string_append_fmt(lib_str, " -l:%.*s ", LIT(lib)); - } else if (string_has_extension(lib, str_lit("so"))) { + } else if (string_ends_with(lib, str_lit(".so"))) { // dynamic lib, relative path to executable // NOTE(vassvik): it is the user's responsibility to make sure the shared library files are visible // at runtimeto the executable |