| ... | ... | @@ -96,7 +96,7 @@ pub fn detect(allocator: Allocator, native_info: NativeTargetInfo) !NativePaths |
| 96 | 96 | return self; |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | | if (comptime native_target.os.tag == .solaris) { |
| 99 | if (builtin.os.tag == .solaris) { |
| 100 | 100 | try self.addLibDir("/usr/lib/64"); |
| 101 | 101 | try self.addLibDir("/usr/local/lib/64"); |
| 102 | 102 | try self.addLibDir("/lib/64"); |
| ... | ... | @@ -107,7 +107,7 @@ pub fn detect(allocator: Allocator, native_info: NativeTargetInfo) !NativePaths |
| 107 | 107 | return self; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | | if (native_target.os.tag != .windows) { |
| 110 | if (builtin.os.tag != .windows) { |
| 111 | 111 | const triple = try native_target.linuxTriple(allocator); |
| 112 | 112 | defer allocator.free(triple); |
| 113 | 113 | |
| ... | ... | @@ -136,11 +136,10 @@ pub fn detect(allocator: Allocator, native_info: NativeTargetInfo) !NativePaths |
| 136 | 136 | // libz.so.1 is in /lib/x86_64-linux-gnu (added here) |
| 137 | 137 | try self.addLibDirFmt("/lib/{s}", .{triple}); |
| 138 | 138 | |
| 139 | | // NOTE: distro like guix doesn't use FHS, so it relies on envorinment |
| 140 | | // variables (C_INCLUDE_PATH, CPLUS_INCLUDE_PATH and LIBRARY_PATH) to |
| 141 | | // search for headers and libraries |
| 142 | | // NOTE: we use os.getenv here since this part won't be executed on |
| 143 | | // windows, to get rid of unnecessary error handling |
| 139 | // Distros like guix don't use FHS, so they rely on environment |
| 140 | // variables to search for headers and libraries. |
| 141 | // We use os.getenv here since this part won't be executed on |
| 142 | // windows, to get rid of unnecessary error handling. |
| 144 | 143 | if (std.os.getenv("C_INCLUDE_PATH")) |c_include_path| { |
| 145 | 144 | var it = mem.tokenize(u8, c_include_path, ":"); |
| 146 | 145 | while (it.next()) |dir| { |
Andrew Kelley <andrew@ziglang.org> 2022-10-17 14:22:38-07:00
lib