Merge commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:59:36 +0000 (16:59 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:59:36 +0000 (16:59 -0300)
* commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed':
  makedef: Add support for identifying the ARM64 machine type

Merged-by: James Almer <jamrial@gmail.com>
compat/windows/makedef

index fd7959a..0cd169c 100755 (executable)
@@ -74,12 +74,12 @@ else
            tr '\t' ' ' |
            grep '^ \+.\+machine \+(.\+)' |
            head -1 |
-           sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}(\(...\)).*/\1/')
+           sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}(\(.\{3,5\}\)).*/\1/')
 
     if [ "${arch}" = "x86" ]; then
         prefix="_"
     else
-        if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ]; then
+        if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ] && [ "${arch}" != "ARM64" ]; then
             echo "Unknown machine type." >&2
             exit 1
         fi