| author |  Andrew Kelley <andrew@ziglang.org> 2019-03-13 23:44:13-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2019-03-13 23:44:38-04:00 |
| log | 862ac42a6e1414d3109ec309d36000a8f22821eb |
| tree | 695ce1112530e709a6baf2a679020e4f39d7d6cd |
| parent | 927efe5f4251382ced866870de4ac50ed14d72d3 |
| signature |  Commit is signed but in an unrecognized format. |
ignore -lm on darwin because it's handled by libSystem
2 files changed, 8 insertions(+), 8 deletions(-)
src/link.cpp+7-7
| ... | ... | @@ -1526,15 +1526,15 @@ static void construct_linker_job_macho(LinkJob *lj) { |
| 1526 | 1526 | if (g->zig_target->is_native) { |
| 1527 | 1527 | for (size_t lib_i = 0; lib_i < g->link_libs_list.length; lib_i += 1) { |
| 1528 | 1528 | LinkLib *link_lib = g->link_libs_list.at(lib_i); |
| 1529 | if (buf_eql_str(link_lib->name, "c")) { | |
| 1529 | if (target_is_libc_lib_name(g->zig_target, buf_ptr(link_lib->name))) { | |
| 1530 | // handled by libSystem | |
| 1530 | 1531 | continue; |
| 1532 | } | |
| 1533 | if (strchr(buf_ptr(link_lib->name), '/') == nullptr) { | |
| 1534 | Buf *arg = buf_sprintf("-l%s", buf_ptr(link_lib->name)); | |
| 1535 | lj->args.append(buf_ptr(arg)); | |
| 1531 | 1536 | } else { |
| 1532 | if (strchr(buf_ptr(link_lib->name), '/') == nullptr) { | |
| 1533 | Buf *arg = buf_sprintf("-l%s", buf_ptr(link_lib->name)); | |
| 1534 | lj->args.append(buf_ptr(arg)); | |
| 1535 | } else { | |
| 1536 | lj->args.append(buf_ptr(link_lib->name)); | |
| 1537 | } | |
| 1537 | lj->args.append(buf_ptr(link_lib->name)); | |
| 1538 | 1538 | } |
| 1539 | 1539 | } |
| 1540 | 1540 | // on Darwin, libSystem has libc in it, but also you have to use it |
src/target.cpp+1-1
| ... | ... | @@ -1477,7 +1477,7 @@ bool target_is_libc_lib_name(const ZigTarget *target, const char *name) { |
| 1477 | 1477 | if (strcmp(name, "c") == 0) |
| 1478 | 1478 | return true; |
| 1479 | 1479 | |
| 1480 | if (target_abi_is_gnu(target->abi) || target_abi_is_musl(target->abi)) { | |
| 1480 | if (target_abi_is_gnu(target->abi) || target_abi_is_musl(target->abi) || target_os_is_darwin(target->os)) { | |
| 1481 | 1481 | if (strcmp(name, "m") == 0) |
| 1482 | 1482 | return true; |
| 1483 | 1483 | if (strcmp(name, "rt") == 0) |