[FFmpeg-cvslog] Merge commit 'cc1c94dacd0642ac1a6cad45deb65071f127d91a'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Feb 19 18:35:32 2018 -0300| [04a8d5c2d7578456fc4d0a605784bf904cc42a4d] | committer: James Almer

Merge commit 'cc1c94dacd0642ac1a6cad45deb65071f127d91a'

* commit 'cc1c94dacd0642ac1a6cad45deb65071f127d91a':
  configure: Pass the right machine types to dlltool for arm and arm64 mingw

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04a8d5c2d7578456fc4d0a605784bf904cc42a4d
---

 configure | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure b/configure
index 3b06b86a6e..013308cfa4 100755
--- a/configure
+++ b/configure
@@ -4997,6 +4997,10 @@ case $target_os in
         LIBTARGET=i386
         if enabled x86_64; then
             LIBTARGET="i386:x86-64"
+        elif enabled arm; then
+            LIBTARGET="arm"
+        elif enabled aarch64; then
+            LIBTARGET="arm64"
         fi
         if enabled shared; then
             # Cannot build both shared and static libs when using dllimport.


======================================================================