authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-06-24 01:59:19-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-06-24 01:59:19-04:00
log93f0bcb649087b5db5cfcba5de5faaaf59047751
treee851e85a6072ff35a7690b4187753a0cbb21b421
parenta1a1f94a0dbd4e4975577357987c786cacc9e6a2

building mingw-w64 for windows ARM looks in lib64/lib32 for .def files

1 files changed, 11 insertions(+), 0 deletions(-)

src/link.cpp+11
......@@ -2377,6 +2377,17 @@ static Error find_mingw_lib_def(LinkJob *lj, const char *name, Buf *out_path) {
23772377 return err;
23782378 }
23792379
2380 if (!does_exist && target_is_arm(g->zig_target)) {
2381 // Try lib32 or lib64
2382 const bool is_32 = target_arch_pointer_bit_width(g->zig_target->arch) == 32;
2383 lib_path = is_32 ? "lib32" : "lib64";
2384 buf_resize(&override_path, 0);
2385 buf_appendf(&override_path, "%s" OS_SEP "libc" OS_SEP "mingw" OS_SEP "%s" OS_SEP "%s.def", buf_ptr(g->zig_lib_dir), lib_path, name);
2386 if ((err = os_file_exists(&override_path, &does_exist)) != ErrorNone) {
2387 return err;
2388 }
2389 }
2390
23802391 if (!does_exist) {
23812392 // Try the generic version
23822393 buf_resize(&override_path, 0);