From 780dda171fc31acc8215cfa314f04c4c44875c96 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 13 Feb 2022 22:46:17 +0000
Subject: Fix determination of HAVE_CPUID with configure script

---
 win/configure | 2 +-
 win/tcl.m4    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/win/configure b/win/configure
index f815682..ab9771f 100755
--- a/win/configure
+++ b/win/configure
@@ -3477,7 +3477,7 @@ echo "${ECHO_T}$ac_cv_win32" >&6
 echo "$as_me: error: ${CC} cannot produce win32 executables." >&2;}
    { (exit 1); exit 1; }; }
 	fi
-	if test "$MACHINE" != "ARM64"; then
+	if test "$do64bit" != "arm64"; then
 	    extra_cflags="$extra_cflags -DHAVE_CPUID=1"
 	fi
 
diff --git a/win/tcl.m4 b/win/tcl.m4
index 26702b6..ddf57f7 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -583,7 +583,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		RC="x86_64-w64-mingw32-windres"
 	    ;;
 	    arm64|aarch64)
-		CC="aarch64-w64-mingw32-${CC}"
+		CC="aarch64-w64-mingw32-clang"
 		LD="aarch64-w64-mingw32-ld"
 		AR="aarch64-w64-mingw32-ar"
 		RANLIB="aarch64-w64-mingw32-ranlib"
@@ -649,7 +649,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	if test "$ac_cv_win32" != "yes"; then
 	    AC_MSG_ERROR([${CC} cannot produce win32 executables.])
 	fi
-	if test "$MACHINE" != "ARM64"; then
+	if test "$do64bit" != "arm64"; then
 	    extra_cflags="$extra_cflags -DHAVE_CPUID=1"
 	fi
 
-- 
cgit v0.12