diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-07 14:42:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-07 14:42:11 (GMT) |
| commit | f48af06d664b9d4f48755833e764c916ec561f68 (patch) | |
| tree | 2e97f81df67e18f020038f1e733d5f42dc8e5f10 /win/configure | |
| parent | dbae7c51f1b2d97b6262237c6cda031a6468e2b4 (diff) | |
| download | tcl-f48af06d664b9d4f48755833e764c916ec561f68.zip tcl-f48af06d664b9d4f48755833e764c916ec561f68.tar.gz tcl-f48af06d664b9d4f48755833e764c916ec561f68.tar.bz2 | |
Fix [bae42b3d24]: [d86e92fb33] et.al. eliminates cpuid when cross compiling for win32
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/win/configure b/win/configure index 8abb3d3..1701b6f 100755 --- a/win/configure +++ b/win/configure @@ -3279,7 +3279,7 @@ fi SHLIB_SUFFIX=".dll" # MACHINE is IX86 for LINK, but this is used by the manifest, - # which requires x86|amd64|ia64. + # which requires x86|amd64|arm64|ia64. MACHINE="X86" if test "$GCC" = "yes"; then @@ -3352,6 +3352,13 @@ echo "${ECHO_T}$ac_cv_cross" >&6 RANLIB="x86_64-w64-mingw32-ranlib" RC="x86_64-w64-mingw32-windres" ;; + arm64) + CC="arm64-w64-mingw32-${CC}" + LD="arm64-w64-mingw32-ld" + AR="arm64-w64-mingw32-ar" + RANLIB="arm64-w64-mingw32-ranlib" + RC="arm64-w64-mingw32-windres" + ;; *) CC="i686-w64-mingw32-${CC}" LD="i686-w64-mingw32-ld" @@ -3470,6 +3477,9 @@ 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 + extra_cflags="$extra_cflags -DHAVE_CPUID=1" + fi hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -mwindows -municode -Dmain=xxmain" echo "$as_me:$LINENO: checking for working -municode linker flag" >&5 @@ -5277,7 +5287,7 @@ case "$TCL_PATCH_LEVEL" in esac TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d ab.`" -# X86|AMD64|IA64 for manifest +# X86|AMD64|ARM64|IA64 for manifest |