mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-15 22:09:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "work around LLVM 10 llvm-config giving absolute path to libz.so"

Browse Source 
This reverts commit 73256dda91d0d5b3d13016d15f2c4465a69cd7d4.

No longer needed with latest release/10.x branch.
This commit is contained in:
Andrew Kelley 2020-03-03 09:17:37 -05:00
parent e4180de2e9
commit 3418a332ab
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build.zig
View File

@ -227,20 +227,15 @@ fn findLLVM(b: *Builder, llvm_config_exe: []const u8) !LibraryDep {
while (it.next()) |lib_arg| {
if (mem.startsWith(u8, lib_arg, "-l")) {
try result.system_libs.append(lib_arg[2..]);
} else if (fs.path.isAbsolute(lib_arg)) {
if (mem.endsWith(u8, lib_arg, "libz.so")) {
// llvm-config version 10 started giving an absolute path to zlib as
// a shared object, which fails to deal with rpaths correctly. Here
// we change it to a normal -lz
try result.system_libs.append("z");
} else {
try result.libs.append(lib_arg);
}
} else {
if (mem.endsWith(u8, lib_arg, ".lib")) {
lib_arg = lib_arg[0 .. lib_arg.len - 4];
if (fs.path.isAbsolute(lib_arg)) {
try result.libs.append(lib_arg);
} else {
if (mem.endsWith(u8, lib_arg, ".lib")) {
lib_arg = lib_arg[0 .. lib_arg.len - 4];
}
try result.system_libs.append(lib_arg);
}
try result.system_libs.append(lib_arg);
}
}
}