diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-06-24 02:08:08 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-06-24 02:08:08 -0400 |
| commit | 3aab6012c471522e2d1cd5a456f56cb9a7addeb6 (patch) | |
| tree | 9472a5c2fbbe2ab97ef56c8bcaa9b9b4044c29dc /src/link.cpp | |
| parent | 93f0bcb649087b5db5cfcba5de5faaaf59047751 (diff) | |
| download | zig-3aab6012c471522e2d1cd5a456f56cb9a7addeb6.tar.gz zig-3aab6012c471522e2d1cd5a456f56cb9a7addeb6.zip | |
Revert "building mingw-w64 for windows ARM looks in lib64/lib32 for .def files"
This reverts commit 93f0bcb649087b5db5cfcba5de5faaaf59047751.
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)
Diffstat (limited to 'src/link.cpp')
| -rw-r--r-- | src/link.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/link.cpp b/src/link.cpp index df33a5494e..0f27cee9ab 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -2377,17 +2377,6 @@ static Error find_mingw_lib_def(LinkJob *lj, const char *name, Buf *out_path) { return err; } - if (!does_exist && target_is_arm(g->zig_target)) { - // Try lib32 or lib64 - const bool is_32 = target_arch_pointer_bit_width(g->zig_target->arch) == 32; - lib_path = is_32 ? "lib32" : "lib64"; - buf_resize(&override_path, 0); - 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); - if ((err = os_file_exists(&override_path, &does_exist)) != ErrorNone) { - return err; - } - } - if (!does_exist) { // Try the generic version buf_resize(&override_path, 0); |
