configure: Don't set X86ASMFLAGS for windows on arm
authorMartin Storsjö <martin@martin.st>
Thu, 7 Feb 2019 10:35:33 +0000 (12:35 +0200)
committerMartin Storsjö <martin@martin.st>
Thu, 7 Feb 2019 10:48:06 +0000 (12:48 +0200)
This avoids enabling HAVE_X86ASM in these configurations, fixing
compilation.

Also set proper values for WINDOWS_ARCH in these configurations.

configure.ac

index 1e142f4..36a6335 100644 (file)
@@ -271,13 +271,23 @@ case "${host_os}" in
         dnl NSIS/MSI Installer prefix and WIN64
         dnl
         case "${host_cpu}" in
-            amd64|x86_64|aarch64)
+            aarch64)
+                HAVE_WIN64="1"
+                WINDOWS_ARCH="arm64"
+                PROGRAMFILES="PROGRAMFILES64"
+                LDFLAGS="${LDFLAGS} -Wl,--high-entropy-va -Wl,--image-base,0x140000000"
+            ;;
+            amd64|x86_64)
                 HAVE_WIN64="1"
                 WINDOWS_ARCH="x64"
                 PROGRAMFILES="PROGRAMFILES64"
                 LDFLAGS="${LDFLAGS} -Wl,--high-entropy-va -Wl,--image-base,0x140000000"
                 X86ASMFLAGS="-f win64"
             ;;
+            armv7)
+                WINDOWS_ARCH="arm"
+                PROGRAMFILES="PROGRAMFILES"
+            ;;
             *)
                 WINDOWS_ARCH="x86"
                 PROGRAMFILES="PROGRAMFILES"