diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-07 14:56:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-07 14:56:12 (GMT) |
| commit | 24cedece7d1913294d3cebe3c0d09474b74bf35e (patch) | |
| tree | 9c26d2c16ce0dbd690c8cf920fb6e7d7efc3e98f /win/configure | |
| parent | 640bfd963a396f1efe29e535041d5bf704b2162e (diff) | |
| parent | 387f9a6753a7866f35f4fc71c0e2bbb9fed77514 (diff) | |
| download | tcl-24cedece7d1913294d3cebe3c0d09474b74bf35e.zip tcl-24cedece7d1913294d3cebe3c0d09474b74bf35e.tar.gz tcl-24cedece7d1913294d3cebe3c0d09474b74bf35e.tar.bz2 | |
Merge 8.7
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 4d9e8d3..4912ba2 100755 --- a/win/configure +++ b/win/configure @@ -4037,7 +4037,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 @@ -4084,6 +4084,13 @@ printf "%s\n" "$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" @@ -4174,6 +4181,9 @@ printf "%s\n" "$ac_cv_win32" >&6; } if test "$ac_cv_win32" != "yes"; then as_fn_error $? "${CC} cannot produce win32 executables." "$LINENO" 5 fi + if test "$MACHINE" != "ARM64"; then + extra_cflags="$extra_cflags -DHAVE_CPUID=1" + fi hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -mwindows -municode -Dmain=xxmain" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working -municode linker flag" >&5 @@ -5831,7 +5841,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 |