Skip to content

Commit 3aab601

Browse files
committed
Revert "building mingw-w64 for windows ARM looks in lib64/lib32 for .def files"
This reverts commit 93f0bcb. This is not correct (from #mingw-w64 IRC): <andrewrk> is there no .def file for ntdll on arm 64 bit? <andrewrk> or does mingw-w64-crt/lib64/ntdll.def apply to both x86_64 and aarch64? <wbs> andrewrk: there's none at the moment (as apps rarely link directly against ntdll, and I didn't want to guess needlessly around that one originally when I added arm64 support, before I actually had a real arm64 windows device) <wbs> andrewrk: but I guess I could/should complete that now <wbs> (if you need one right now, the libarm32 one probably is the closest match)
1 parent 93f0bcb commit 3aab601

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

src/link.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2377,17 +2377,6 @@ 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-
23912380
if (!does_exist) {
23922381
// Try the generic version
23932382
buf_resize(&override_path, 0);

0 commit comments

Comments
 (0)