diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-08 10:04:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-08 10:04:08 (GMT) |
| commit | 94d7b078fad30fc89ef45da8d9ab20b0832567b3 (patch) | |
| tree | 2e97f81df67e18f020038f1e733d5f42dc8e5f10 /win/tcl.m4 | |
| parent | 8f8b424c15d02d04e3289418b601c7443c1c6f27 (diff) | |
| parent | f48af06d664b9d4f48755833e764c916ec561f68 (diff) | |
| download | tcl-94d7b078fad30fc89ef45da8d9ab20b0832567b3.zip tcl-94d7b078fad30fc89ef45da8d9ab20b0832567b3.tar.gz tcl-94d7b078fad30fc89ef45da8d9ab20b0832567b3.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -557,7 +557,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ 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 @@ -582,6 +582,13 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ 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" @@ -642,6 +649,9 @@ 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 + extra_cflags="$extra_cflags -DHAVE_CPUID=1" + fi hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -mwindows -municode -Dmain=xxmain" AC_CACHE_CHECK(for working -municode linker flag, |