mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-14 10:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

glibc: allow linking against external libcrypt.

Browse Source 
Support for the built-in libcrypt was removed in commit 6b7ddfba,
but the -lcrypt flag remained ignored, preventing linking against
external libcrypt.

Fixes #5990.

Signed-off-by: Piotr Sikora <piotr@aviatrix.com>
This commit is contained in:
Piotr Sikora 2022-12-21 17:56:07 +00:00 committed by Andrew Kelley
parent 311d50f9dc
commit cb54e9a3c2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/target.zig
View File

@ -375,8 +375,6 @@ pub fn is_libc_lib_name(target: std.Target, name: []const u8) bool {
return true; return true;
if (eqlIgnoreCase(ignore_case, name, "pthread")) if (eqlIgnoreCase(ignore_case, name, "pthread"))
return true; return true;
if (eqlIgnoreCase(ignore_case, name, "crypt"))
return true;
if (eqlIgnoreCase(ignore_case, name, "util")) if (eqlIgnoreCase(ignore_case, name, "util"))
return true; return true;
if (eqlIgnoreCase(ignore_case, name, "xnet")) if (eqlIgnoreCase(ignore_case, name, "xnet"))
@ -387,6 +385,11 @@ pub fn is_libc_lib_name(target: std.Target, name: []const u8) bool {
return true; return true;
} }
if (target.abi.isMusl() or target.os.tag.isDarwin()) {
if (eqlIgnoreCase(ignore_case, name, "crypt"))
return true;
}
if (target.os.tag.isDarwin() and eqlIgnoreCase(ignore_case, name, "System")) if (target.os.tag.isDarwin() and eqlIgnoreCase(ignore_case, name, "System"))
return true; return true;