diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-13 22:46:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-13 22:46:17 (GMT) |
| commit | 780dda171fc31acc8215cfa314f04c4c44875c96 (patch) | |
| tree | c21d27616540dd7b0a964db727c421145865db8b | |
| parent | 12315d87b5f80a7528bd95f37286f5a657734a1d (diff) | |
| download | tcl-780dda171fc31acc8215cfa314f04c4c44875c96.zip tcl-780dda171fc31acc8215cfa314f04c4c44875c96.tar.gz tcl-780dda171fc31acc8215cfa314f04c4c44875c96.tar.bz2 | |
Fix determination of HAVE_CPUID with configure script
| -rwxr-xr-x | win/configure | 2 | ||||
| -rw-r--r-- | 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 @@ -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 |