| ... | ... | @@ -2480,9 +2480,19 @@ pub const LibExeObjStep = struct { |
| 2480 | 2480 | try zig_args.append("--test-cmd"); |
| 2481 | 2481 | try zig_args.append(bin_name); |
| 2482 | 2482 | if (glibc_dir_arg) |dir| { |
| 2483 | | const full_dir = try fs.path.join(builder.allocator, &[_][]const u8{ |
| 2484 | | dir, |
| 2485 | | try self.target.linuxTriple(builder.allocator), |
| 2483 | // TODO look into making this a call to `linuxTriple`. This |
| 2484 | // needs the directory to be called "i686" rather than |
| 2485 | // "i386" which is why we do it manually here. |
| 2486 | const fmt_str = "{s}" ++ fs.path.sep_str ++ "{s}-{s}-{s}"; |
| 2487 | const cpu_arch = self.target.getCpuArch(); |
| 2488 | const os_tag = self.target.getOsTag(); |
| 2489 | const abi = self.target.getAbi(); |
| 2490 | const cpu_arch_name: []const u8 = if (cpu_arch == .i386) |
| 2491 | "i686" |
| 2492 | else |
| 2493 | @tagName(cpu_arch); |
| 2494 | const full_dir = try std.fmt.allocPrint(builder.allocator, fmt_str, .{ |
| 2495 | dir, cpu_arch_name, @tagName(os_tag), @tagName(abi), |
| 2486 | 2496 | }); |
| 2487 | 2497 | |
| 2488 | 2498 | try zig_args.append("--test-cmd"); |
Andrew Kelley <andrew@ziglang.org> 2021-05-12 20:37:40-07:00
lib