Skip to content

Commit

Permalink
Auto merge of #108355 - dpaoliello:dlltoolm, r=michaelwoerister
Browse files Browse the repository at this point in the history
Fix cross-compiling with dlltool for raw-dylib

Fix for #103939

Issue Details:
When attempting to cross-compile using the `raw-dylib` feature and the GNU toolchain, rustc would attempt to find a cross-compiling version of dlltool (e.g., `i686-w64-mingw32-dlltool`). The has two issues 1) on Windows dlltool is always `dlltool` (no cross-compiling named versions exist) and 2) it only supported compiling to i686 and x86_64 resulting in ARM 32 and 64 compiling as x86_64.

Fix Details:
* On Windows always use the normal `dlltool` binary.
* Add the ARM64 cross-compiling dlltool name (support for this is coming: https://sourceware.org/bugzilla/show_bug.cgi?id=29964)
* Provide the `-m` argument to dlltool to indicate the target machine type.

(This is the first of two PRs to fix the remaining issues for the `raw-dylib` feature (#58713) that is blocking stabilization (#104218))
  • Loading branch information
bors committed Mar 23, 2023
2 parents 5c0a70f + e961939 commit 0908524
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 0908524

Please sign in to comment.