Commit 73256dda91d0d5b3d13016d15f2c4465a69cd7d4 | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-02-04 15:04:11-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-02-04 15:04:11-05:00
log	73256dda91d0d5b3d13016d15f2c4465a69cd7d4
tree	94162e4d45ddfffd19bcdcf833d972d3f754a5c9
parent	a9df637fb11713c41024e6f3b6a1f4f86c33b09e
signature	Commit is signed but in an unrecognized format.

1 files changed, 12 insertions(+), 7 deletions(-)

build.zig+12-7

 @@ -230,15 +230,20 @@ 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 {
+            } else if (fs.path.isAbsolute(lib_arg)) {
-                if (fs.path.isAbsolute(lib_arg)) {
+                if (mem.endsWith(u8, lib_arg, "libz.so")) {
-                    try result.libs.append(lib_arg);
+                    // 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 {
-                    if (mem.endsWith(u8, lib_arg, ".lib")) {
+                    try result.libs.append(lib_arg);
-                        lib_arg = lib_arg[0 .. lib_arg.len - 4];
+                }
-                    }
+            } else {
-                    try result.system_libs.append(lib_arg);
+                if (mem.endsWith(u8, lib_arg, ".lib")) {
+                    lib_arg = lib_arg[0 .. lib_arg.len - 4];
                 }
+                try result.system_libs.append(lib_arg);
             }
         }
     }