aboutsummaryrefslogtreecommitdiff
path: root/build.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-03-03 09:17:37 -0500
committerAndrew Kelley <andrew@ziglang.org>2020-03-03 09:17:37 -0500
commit3418a332ab3a120f21354d98579d7a3a2dcb523b (patch)
tree2ad84786e1a993fe8087bf3755d730533d919aeb /build.zig
parente4180de2e9a0b94eed793e43d471e0b563ac43d3 (diff)
downloadzig-3418a332ab3a120f21354d98579d7a3a2dcb523b.tar.gz
zig-3418a332ab3a120f21354d98579d7a3a2dcb523b.zip
Revert "work around LLVM 10 llvm-config giving absolute path to libz.so"
This reverts commit 73256dda91d0d5b3d13016d15f2c4465a69cd7d4. No longer needed with latest release/10.x branch.
Diffstat (limited to 'build.zig')
-rw-r--r--build.zig19
1 files changed, 7 insertions, 12 deletions
diff --git a/build.zig b/build.zig
index 41d9cdc0cc..5f55726d05 100644
--- a/build.zig
+++ b/build.zig
@@ -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);
}
}
}